Alexyz/999
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: unified 1..9 words session narrative, dice input before reveal, dedicated results screen, and clean session history grouping

Browse Source
This commit is contained in:
Alma Alexyz
2026-08-31 15:23:59 +05:00
parent bc892c3388
commit 6f9d4d4cca
11 changed files with 1207 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/services/words_repository.dart
+80 -88
View File
@@ -1,4 +1,3 @@
import 'dart:convert';
import 'dart:math';
import 'package:shared_preferences/shared_preferences.dart';
import '../data/words_data.dart';
@@ -10,111 +9,76 @@ class WordsRepository {
factory WordsRepository() => _instance;
WordsRepository._internal();
final List<WordItem> _masterWords = List.from(kRussianTop1000Words);
static const String _kHistoryKey = 'oracle_999_sessions_history_v2';
List<WordItem> _sessionWords = [];
final List<HistoryEntry> _history = [];
bool _isInitialized = false;
final List<OracleSession> _sessions = [];
List<WordItem> get allWords => List.unmodifiable(_sessionWords);
List<OracleSession> get sessions => List.unmodifiable(_sessions);
List<OracleSession> get history => sessions; // Alias for compatibility
int get totalWords => _sessionWords.length;
List<HistoryEntry> get history => List.unmodifiable(_history);
Future<void> init() async {
if (_isInitialized) return;
// Always reshuffle session numbers on startup for true synchronicity & randomization
reshuffleSessionNumbers();
// 1. Initialize random session mapping
_initializeSessionMapping();
// Load history from persistence
try {
final prefs = await SharedPreferences.getInstance();
final historyJsonList = prefs.getStringList('oracle_history_entries') ?? [];
_history.clear();
for (final str in historyJsonList) {
try {
final map = jsonDecode(str) as Map<String, dynamic>;
_history.add(HistoryEntry.fromMap(map));
} catch (_) {}
}
} catch (_) {}
_isInitialized = true;
// 2. Load stored session history
await _loadHistoryFromPrefs();
}
/// Cryptographic/pseudo-random Fisher-Yates shuffle to map 000..999 to words for the current session
void reshuffleSessionNumbers() {
void _initializeSessionMapping() {
final list = List<WordItem>.from(kRussianTop1000Words);
final random = Random();
final indices = List<int>.generate(_masterWords.length, (i) => i);
indices.shuffle(random);
final mappedList = <WordItem>[];
for (int i = 0; i < _masterWords.length; i++) {
final baseWord = _masterWords[indices[i]];
// i is the dynamic sessionNumber (0..999)
final sessionItem = baseWord.copyWith(sessionNumber: i);
mappedList.add(sessionItem);
// Fisher-Yates shuffle
for (int i = list.length - 1; i > 0; i--) {
int n = random.nextInt(i + 1);
final temp = list[i];
list[i] = list[n];
list[n] = temp;
}
_sessionWords = mappedList;
_sessionWords = [];
for (int i = 0; i < list.length; i++) {
_sessionWords.add(list[i].copyWith(sessionNumber: i));
}
}
WordItem? getWordBySessionNumber(int sessionNum) {
if (sessionNum < 0 || sessionNum >= _sessionWords.length) return null;
return _sessionWords[sessionNum];
void reshuffleSessionNumbers() {
_initializeSessionMapping();
}
WordItem? getWordById(int id) {
return getWordBySessionNumber(id);
WordItem? getWordBySessionNumber(int number) {
if (number < 0 || number >= _sessionWords.length) return null;
return _sessionWords[number];
}
WordItem getRandomWord() {
if (_sessionWords.isEmpty) {
return _masterWords.first;
}
final random = Random();
final index = random.nextInt(_sessionWords.length);
return _sessionWords[index];
final idx = random.nextInt(_sessionWords.length);
return _sessionWords[idx];
}
WordItem getNextWord(int currentSessionNum) {
if (_sessionWords.isEmpty) return getRandomWord();
final nextId = (currentSessionNum + 1) % _sessionWords.length;
return _sessionWords[nextId];
WordItem getNextWord(int currentSessionNumber) {
int nextNumber = (currentSessionNumber + 1) % _sessionWords.length;
return _sessionWords[nextNumber];
}
WordItem getPreviousWord(int currentSessionNum) {
if (_sessionWords.isEmpty) return getRandomWord();
final prevId = (currentSessionNum - 1 + _sessionWords.length) % _sessionWords.length;
return _sessionWords[prevId];
WordItem getPreviousWord(int currentSessionNumber) {
int prevNumber = (currentSessionNumber - 1 + _sessionWords.length) % _sessionWords.length;
return _sessionWords[prevNumber];
}
List<WordItem> search(String rawQuery) {
final query = rawQuery.trim().toLowerCase();
if (query.isEmpty) return _sessionWords;
List<WordItem> search(String query) {
query = query.trim().toLowerCase();
if (query.isEmpty) return [];
// Check if query is a number (e.g. 0, 00, 000, 42, 042, 999)
final number = int.tryParse(query);
if (number != null && number >= 0 && number < _sessionWords.length) {
final exact = _sessionWords[number];
final matches = _sessionWords.where((w) {
if (w.sessionNumber == number) return false;
final idStr = w.sessionNumber.toString();
final paddedStr = w.formattedSessionNumber;
return idStr.startsWith(query) || paddedStr.startsWith(query);
}).take(30).toList();
return [exact, ...matches];
return [_sessionWords[number]];
}
// Partial numeric match
if (RegExp(r'^\d+$').hasMatch(query)) {
return _sessionWords.where((w) {
final idStr = w.sessionNumber.toString();
final paddedStr = w.formattedSessionNumber;
return idStr.startsWith(query) || paddedStr.startsWith(query);
}).take(30).toList();
}
// Text search in word, description, category, and part of speech
final exact = <WordItem>[];
final startsWith = <WordItem>[];
final contains = <WordItem>[];
@@ -156,21 +120,29 @@ class WordsRepository {
return set.toList();
}
// --- History Management ---
// --- Session History Management ---
Future<void> addHistoryEntry(HistoryEntry entry) async {
_history.insert(0, entry);
if (_history.length > 500) {
_history.removeRange(500, _history.length);
Future<void> saveSession(OracleSession session) async {
final existingIdx = _sessions.indexWhere((s) => s.id == session.id);
if (existingIdx != -1) {
_sessions[existingIdx] = session;
} else {
_sessions.insert(0, session);
}
if (_sessions.length > 500) {
_sessions.removeRange(500, _sessions.length);
}
await _saveHistoryToPrefs();
}
Future<void> updateHistoryEntry(String id, {String? aiInterpretation, String? question}) async {
final idx = _history.indexWhere((e) => e.id == id);
// Backward compatibility alias
Future<void> addHistoryEntry(OracleSession entry) => saveSession(entry);
Future<void> updateSession(String id, {String? aiInterpretation, String? question}) async {
final idx = _sessions.indexWhere((e) => e.id == id);
if (idx != -1) {
final old = _history[idx];
_history[idx] = old.copyWith(
final old = _sessions[idx];
_sessions[idx] = old.copyWith(
aiInterpretation: aiInterpretation ?? old.aiInterpretation,
question: question ?? old.question,
);
@@ -178,21 +150,41 @@ class WordsRepository {
}
}
Future<void> deleteHistoryEntry(String id) async {
_history.removeWhere((e) => e.id == id);
Future<void> updateHistoryEntry(String id, {String? aiInterpretation, String? question}) =>
updateSession(id, aiInterpretation: aiInterpretation, question: question);
Future<void> deleteSession(String id) async {
_sessions.removeWhere((e) => e.id == id);
await _saveHistoryToPrefs();
}
Future<void> deleteHistoryEntry(String id) => deleteSession(id);
Future<void> clearHistory() async {
_history.clear();
_sessions.clear();
await _saveHistoryToPrefs();
}
Future<void> _loadHistoryFromPrefs() async {
try {
final prefs = await SharedPreferences.getInstance();
final jsonList = prefs.getStringList(_kHistoryKey);
_sessions.clear();
if (jsonList != null) {
for (final item in jsonList) {
try {
_sessions.add(OracleSession.fromJson(item));
} catch (_) {}
}
}
} catch (_) {}
}
Future<void> _saveHistoryToPrefs() async {
try {
final prefs = await SharedPreferences.getInstance();
final list = _history.map((e) => jsonEncode(e.toMap())).toList();
await prefs.setStringList('oracle_history_entries', list);
final jsonList = _sessions.map((e) => e.toJson()).toList();
await prefs.setStringList(_kHistoryKey, jsonList);
} catch (_) {}
}
}