Add accent colour picker, fix empty user card when accepting friend request, add button to transfer allocations
All checks were successful
Release / meta (push) Successful in 8s
Release / linux-build (push) Successful in 56s
Release / web-build (push) Successful in 2m15s
Release / android-build (push) Successful in 6m47s
Release / release-master (push) Successful in 19s
Release / release-dev (push) Successful in 21s
All checks were successful
Release / meta (push) Successful in 8s
Release / linux-build (push) Successful in 56s
Release / web-build (push) Successful in 2m15s
Release / android-build (push) Successful in 6m47s
Release / release-master (push) Successful in 19s
Release / release-dev (push) Successful in 21s
This commit is contained in:
51
lib/services/accent_color_service.dart
Normal file
51
lib/services/accent_color_service.dart
Normal file
@@ -0,0 +1,51 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
class AccentColorService extends ChangeNotifier {
|
||||
static const _prefsKeyUseSystem = 'accent_use_system';
|
||||
static const _prefsKeySeed = 'accent_seed';
|
||||
static const Color defaultSeed = Colors.red;
|
||||
|
||||
bool _useSystem = true;
|
||||
Color _seedColor = defaultSeed;
|
||||
bool _hasSavedSeed = false;
|
||||
bool _loaded = false;
|
||||
|
||||
bool get useSystem => _useSystem;
|
||||
Color get seedColor => _seedColor;
|
||||
bool get hasSavedSeed => _hasSavedSeed;
|
||||
bool get isLoaded => _loaded;
|
||||
|
||||
AccentColorService() {
|
||||
_load();
|
||||
}
|
||||
|
||||
Future<void> _load() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
_useSystem = prefs.getBool(_prefsKeyUseSystem) ?? true;
|
||||
final seedValue = prefs.getInt(_prefsKeySeed);
|
||||
if (seedValue != null) {
|
||||
_seedColor = Color(seedValue);
|
||||
_hasSavedSeed = true;
|
||||
}
|
||||
_loaded = true;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setUseSystem(bool value) async {
|
||||
_useSystem = value;
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setBool(_prefsKeyUseSystem, _useSystem);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setSeedColor(Color color) async {
|
||||
_seedColor = color;
|
||||
_useSystem = false;
|
||||
_hasSavedSeed = true;
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setInt(_prefsKeySeed, color.toARGB32());
|
||||
await prefs.setBool(_prefsKeyUseSystem, _useSystem);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
@@ -151,6 +151,8 @@ extension DataServiceFriendships on DataService {
|
||||
overrideAddressee: targetUser,
|
||||
);
|
||||
_pendingOutgoing = [friendship, ..._pendingOutgoing];
|
||||
await fetchFriendships();
|
||||
await fetchPendingFriendships();
|
||||
_notifyAsync();
|
||||
return friendship;
|
||||
}
|
||||
@@ -159,6 +161,8 @@ extension DataServiceFriendships on DataService {
|
||||
final json = await api.post('/friendships/$friendshipId/accept', {});
|
||||
final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'accepted');
|
||||
_pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
|
||||
await fetchFriendships();
|
||||
await fetchPendingFriendships();
|
||||
_notifyAsync();
|
||||
return friendship;
|
||||
}
|
||||
@@ -177,6 +181,8 @@ extension DataServiceFriendships on DataService {
|
||||
_parseAndRemoveFriendship(json, friendshipId, status: 'none');
|
||||
_pendingOutgoing =
|
||||
_pendingOutgoing.where((f) => f.id != friendshipId).toList();
|
||||
await fetchFriendships();
|
||||
await fetchPendingFriendships();
|
||||
_notifyAsync();
|
||||
return friendship;
|
||||
}
|
||||
@@ -193,6 +199,8 @@ extension DataServiceFriendships on DataService {
|
||||
_pendingIncoming.where((f) => f.id != friendshipId).toList();
|
||||
_pendingOutgoing =
|
||||
_pendingOutgoing.where((f) => f.id != friendshipId).toList();
|
||||
await fetchFriendships();
|
||||
await fetchPendingFriendships();
|
||||
_notifyAsync();
|
||||
}
|
||||
|
||||
|
||||
@@ -466,6 +466,21 @@ extension DataServiceTraction on DataService {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> transferAllocations({
|
||||
required int fromLocoId,
|
||||
required int toLocoId,
|
||||
}) async {
|
||||
try {
|
||||
await api.post('/loco/alloc/transfer', {
|
||||
'loco_id': fromLocoId,
|
||||
'to_loco_id': toLocoId,
|
||||
});
|
||||
} catch (e) {
|
||||
debugPrint('Failed to transfer allocations $fromLocoId -> $toLocoId: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> adminDeleteLoco({required int locoId}) async {
|
||||
try {
|
||||
await api.delete('/loco/admin/delete/$locoId');
|
||||
|
||||
47
lib/services/theme_mode_service.dart
Normal file
47
lib/services/theme_mode_service.dart
Normal file
@@ -0,0 +1,47 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
class ThemeModeService extends ChangeNotifier {
|
||||
static const _prefsKey = 'theme_mode_preference';
|
||||
|
||||
ThemeMode _mode = ThemeMode.system;
|
||||
bool _loaded = false;
|
||||
|
||||
ThemeMode get mode => _mode;
|
||||
bool get isLoaded => _loaded;
|
||||
|
||||
ThemeModeService() {
|
||||
_load();
|
||||
}
|
||||
|
||||
Future<void> _load() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final saved = prefs.getString(_prefsKey);
|
||||
if (saved != null) {
|
||||
switch (saved) {
|
||||
case 'light':
|
||||
_mode = ThemeMode.light;
|
||||
break;
|
||||
case 'dark':
|
||||
_mode = ThemeMode.dark;
|
||||
break;
|
||||
default:
|
||||
_mode = ThemeMode.system;
|
||||
}
|
||||
}
|
||||
_loaded = true;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setMode(ThemeMode mode) async {
|
||||
_mode = mode;
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final value = switch (mode) {
|
||||
ThemeMode.light => 'light',
|
||||
ThemeMode.dark => 'dark',
|
||||
_ => 'system',
|
||||
};
|
||||
await prefs.setString(_prefsKey, value);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user