Skip to content

Offline gym log for Android. No account, no ads, no internet.

AMOLED black theme

InlitXa17265672401
diff --git a/lib/app/gymmane_app.dart b/lib/app/gymmane_app.dart
index 144a869..56a1b34 100644
--- a/lib/app/gymmane_app.dart
+++ b/lib/app/gymmane_app.dart
@@ -17,7 +17,7 @@ class GymManeApp extends StatefulWidget {
}
class _GymManeAppState extends State<GymManeApp> {
- var _look = (fit.themeMode, fit.locale);
+ var _look = (fit.themeMode, fit.locale, fit.themePref == 'amoled');
@override
void initState() {
@@ -32,7 +32,7 @@ class _GymManeAppState extends State<GymManeApp> {
}
void _watch() {
- final look = (fit.themeMode, fit.locale);
+ final look = (fit.themeMode, fit.locale, fit.themePref == 'amoled');
if (look != _look) setState(() => _look = look);
}
@@ -42,7 +42,7 @@ class _GymManeAppState extends State<GymManeApp> {
title: 'GymMane',
debugShowCheckedModeBanner: false,
theme: AppTheme.light,
- darkTheme: AppTheme.dark,
+ darkTheme: _look.$3 ? AppTheme.amoled : AppTheme.dark,
themeMode: _look.$1,
locale: _look.$2,
supportedLocales: AppLocalizations.supportedLocales,
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index d5423ec..23561e5 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -371,6 +371,7 @@
"theme": "السمة",
"darkTheme": "داكن",
"lightTheme": "فاتح",
+ "amoledTheme": "أسود AMOLED",
"editDuration": "مدة التمرين",
"languageLabel": "اللغة",
"unitsLabel": "الوحدات",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index ca6b6b3..881f4ad 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -381,6 +381,7 @@
"theme": "Erscheinungsbild",
"darkTheme": "Dunkel",
"lightTheme": "Hell",
+ "amoledTheme": "AMOLED-Schwarz",
"editDuration": "Trainingsdauer",
"languageLabel": "Sprache",
"unitsLabel": "Einheiten",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index d2424c9..cc44c6d 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -383,6 +383,7 @@
"theme": "Theme",
"darkTheme": "Dark",
"lightTheme": "Light",
+ "amoledTheme": "AMOLED black",
"editDuration": "Workout length",
"languageLabel": "Language",
"unitsLabel": "Units",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index a82e58a..40d4aca 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -348,6 +348,7 @@
"theme": "Tema",
"darkTheme": "Oscuro",
"lightTheme": "Claro",
+ "amoledTheme": "Negro AMOLED",
"editDuration": "Duración del entreno",
"languageLabel": "Idioma",
"unitsLabel": "Unidades",
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 440be21..5e043fa 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -616,6 +616,7 @@
"theme": "تم",
"darkTheme": "تاریک",
"lightTheme": "روشن",
+ "amoledTheme": "مشکی AMOLED",
"editDuration": "مدت تمرین",
"languageLabel": "زبان",
"unitsLabel": "واحدها",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index c6d7bd8..46c06fd 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -371,6 +371,7 @@
"theme": "Thème",
"darkTheme": "Sombre",
"lightTheme": "Clair",
+ "amoledTheme": "Noir AMOLED",
"editDuration": "Durée de la séance",
"languageLabel": "Langue",
"unitsLabel": "Unités",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 5c253dc..4b4f169 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -383,6 +383,7 @@
"theme": "Tema",
"darkTheme": "Scuro",
"lightTheme": "Chiaro",
+ "amoledTheme": "Nero AMOLED",
"editDuration": "Durata dell’allenamento",
"languageLabel": "Lingua",
"unitsLabel": "Unità",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 47e3a52..eed1bcf 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -371,6 +371,7 @@
"theme": "テーマ",
"darkTheme": "ダーク",
"lightTheme": "ライト",
+ "amoledTheme": "AMOLEDブラック",
"editDuration": "トレーニング時間",
"languageLabel": "言語",
"unitsLabel": "単位",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index 16db4e2..95e2abd 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -371,6 +371,7 @@
"theme": "테마",
"darkTheme": "다크",
"lightTheme": "라이트",
+ "amoledTheme": "AMOLED 블랙",
"editDuration": "운동 시간",
"languageLabel": "언어",
"unitsLabel": "단위",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 6a8cd6b..ee26af5 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -2008,6 +2008,12 @@ abstract class AppLocalizations {
/// **'Light'**
String get lightTheme;
+ /// No description provided for @amoledTheme.
+ ///
+ /// In en, this message translates to:
+ /// **'AMOLED black'**
+ String get amoledTheme;
+
/// No description provided for @editDuration.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
index 5637a1d..6226a00 100644
--- a/lib/l10n/app_localizations_ar.dart
+++ b/lib/l10n/app_localizations_ar.dart
@@ -1104,6 +1104,9 @@ class AppLocalizationsAr extends AppLocalizations {
@override
String get lightTheme => 'فاتح';
+ @override
+ String get amoledTheme => 'أسود AMOLED';
+
@override
String get editDuration => 'مدة التمرين';
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 378fb23..8440c92 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -1117,6 +1117,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get lightTheme => 'Hell';
+ @override
+ String get amoledTheme => 'AMOLED-Schwarz';
+
@override
String get editDuration => 'Trainingsdauer';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 78dd590..ed44392 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1112,6 +1112,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get lightTheme => 'Light';
+ @override
+ String get amoledTheme => 'AMOLED black';
+
@override
String get editDuration => 'Workout length';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 653db14..afceda5 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -1111,6 +1111,9 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get lightTheme => 'Claro';
+ @override
+ String get amoledTheme => 'Negro AMOLED';
+
@override
String get editDuration => 'Duración del entreno';
diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dart
index e367557..703b6c6 100644
--- a/lib/l10n/app_localizations_fa.dart
+++ b/lib/l10n/app_localizations_fa.dart
@@ -1105,6 +1105,9 @@ class AppLocalizationsFa extends AppLocalizations {
@override
String get lightTheme => 'روشن';
+ @override
+ String get amoledTheme => 'مشکی AMOLED';
+
@override
String get editDuration => 'مدت تمرین';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 2ed57b8..d48902d 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -1116,6 +1116,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get lightTheme => 'Clair';
+ @override
+ String get amoledTheme => 'Noir AMOLED';
+
@override
String get editDuration => 'Durée de la séance';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index c1a6e2c..13ef1e1 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -1112,6 +1112,9 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get lightTheme => 'Chiaro';
+ @override
+ String get amoledTheme => 'Nero AMOLED';
+
@override
String get editDuration => 'Durata dell’allenamento';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 90f60c5..0b7cd33 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -1063,6 +1063,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get lightTheme => 'ライト';
+ @override
+ String get amoledTheme => 'AMOLEDブラック';
+
@override
String get editDuration => 'トレーニング時間';
diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart
index 5e3c1cb..e010ebb 100644
--- a/lib/l10n/app_localizations_ko.dart
+++ b/lib/l10n/app_localizations_ko.dart
@@ -1081,6 +1081,9 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get lightTheme => '라이트';
+ @override
+ String get amoledTheme => 'AMOLED 블랙';
+
@override
String get editDuration => '운동 시간';
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 85027a4..9dc8169 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -1114,6 +1114,9 @@ class AppLocalizationsNl extends AppLocalizations {
@override
String get lightTheme => 'Licht';
+ @override
+ String get amoledTheme => 'AMOLED-zwart';
+
@override
String get editDuration => 'Duur van de training';
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index e2ccf81..329d38d 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -1113,6 +1113,9 @@ class AppLocalizationsPl extends AppLocalizations {
@override
String get lightTheme => 'Jasny';
+ @override
+ String get amoledTheme => 'Czerń AMOLED';
+
@override
String get editDuration => 'Czas treningu';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 555df7f..f145fdb 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -1115,6 +1115,9 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get lightTheme => 'Claro';
+ @override
+ String get amoledTheme => 'Preto AMOLED';
+
@override
String get editDuration => 'Duração do treino';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 1fddaac..48ab387 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -1154,6 +1154,9 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get lightTheme => 'Светлая';
+ @override
+ String get amoledTheme => 'Чёрная AMOLED';
+
@override
String get editDuration => 'Длительность тренировки';
diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dart
index 47ebb40..8d9acc8 100644
--- a/lib/l10n/app_localizations_tr.dart
+++ b/lib/l10n/app_localizations_tr.dart
@@ -1113,6 +1113,9 @@ class AppLocalizationsTr extends AppLocalizations {
@override
String get lightTheme => 'Açık';
+ @override
+ String get amoledTheme => 'AMOLED siyah';
+
@override
String get editDuration => 'Antrenman süresi';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index a641d8e..a66f5f4 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -1112,6 +1112,9 @@ class AppLocalizationsUk extends AppLocalizations {
@override
String get lightTheme => 'Світла';
+ @override
+ String get amoledTheme => 'Чорна AMOLED';
+
@override
String get editDuration => 'Тривалість тренування';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 0ecdba8..856befc 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1058,6 +1058,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get lightTheme => '浅色模式';
+ @override
+ String get amoledTheme => 'AMOLED 纯黑';
+
@override
String get editDuration => '训练时长';
@@ -4359,6 +4362,9 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {
@override
String get lightTheme => '淺色';
+ @override
+ String get amoledTheme => 'AMOLED 純黑';
+
@override
String get editDuration => '訓練時長';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index ff6c941..95f8a2b 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -371,6 +371,7 @@
"theme": "Thema",
"darkTheme": "Donker",
"lightTheme": "Licht",
+ "amoledTheme": "AMOLED-zwart",
"editDuration": "Duur van de training",
"languageLabel": "Taal",
"unitsLabel": "Eenheden",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 5106686..f1bbf6e 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -371,6 +371,7 @@
"theme": "Motyw",
"darkTheme": "Ciemny",
"lightTheme": "Jasny",
+ "amoledTheme": "Czerń AMOLED",
"editDuration": "Czas treningu",
"languageLabel": "Język",
"unitsLabel": "Jednostki",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 18ca42b..4dd0a44 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -194,6 +194,7 @@
"theme": "Tema",
"darkTheme": "Escuro",
"lightTheme": "Claro",
+ "amoledTheme": "Preto AMOLED",
"editDuration": "Duração do treino",
"languageLabel": "Idioma",
"unitsLabel": "Unidades",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 327c7e9..d672d4f 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -342,6 +342,7 @@
"theme": "Тема",
"darkTheme": "Тёмная",
"lightTheme": "Светлая",
+ "amoledTheme": "Чёрная AMOLED",
"editDuration": "Длительность тренировки",
"languageLabel": "Язык",
"unitsLabel": "Единицы",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 96c4c65..a6d1660 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -371,6 +371,7 @@
"theme": "Tema",
"darkTheme": "Koyu",
"lightTheme": "Açık",
+ "amoledTheme": "AMOLED siyah",
"editDuration": "Antrenman süresi",
"languageLabel": "Dil",
"unitsLabel": "Birimler",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 6ada4b2..6aac706 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -371,6 +371,7 @@
"theme": "Тема",
"darkTheme": "Темна",
"lightTheme": "Світла",
+ "amoledTheme": "Чорна AMOLED",
"editDuration": "Тривалість тренування",
"languageLabel": "Мова",
"unitsLabel": "Одиниці",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 0837cde..418cbdc 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -194,6 +194,7 @@
"theme": "外观主题",
"darkTheme": "深色模式",
"lightTheme": "浅色模式",
+ "amoledTheme": "AMOLED 纯黑",
"editDuration": "训练时长",
"languageLabel": "语言",
"unitsLabel": "单位",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index def9a19..29bd7c6 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -371,6 +371,7 @@
"theme": "主題",
"darkTheme": "深色",
"lightTheme": "淺色",
+ "amoledTheme": "AMOLED 純黑",
"editDuration": "訓練時長",
"languageLabel": "語言",
"unitsLabel": "單位",
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index ed178e2..ee973a2 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -69,6 +69,7 @@ class SettingsScreen extends StatelessWidget {
[
('system', t.themeAuto, PhosphorIconsRegular.circleHalf),
('dark', t.darkTheme, PhosphorIconsRegular.moon),
+ ('amoled', t.amoledTheme, PhosphorIconsRegular.moonStars),
('light', t.lightTheme, PhosphorIconsRegular.sun),
],
() => fit.themePref,
diff --git a/lib/services/home_widget_bridge.dart b/lib/services/home_widget_bridge.dart
index 07a73aa..94e2cfa 100644
--- a/lib/services/home_widget_bridge.dart
+++ b/lib/services/home_widget_bridge.dart
@@ -76,8 +76,9 @@ class HomeWidgetBridge {
_groupReady = true;
}
final pref = fit.themePref;
- final day = pref == 'dark' ? GymColors.dark : GymColors.light;
- final night = pref == 'light' ? GymColors.light : GymColors.dark;
+ final darkColors = pref == 'amoled' ? GymColors.amoled : GymColors.dark;
+ final day = pref == 'dark' || pref == 'amoled' ? darkColors : GymColors.light;
+ final night = pref == 'light' ? GymColors.light : darkColors;
final framed = !_ios;
const heatmapSize = Size(320, 150);
const statsSize = Size(155, 155);
diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dart
index fbd1cb7..b468f52 100644
--- a/lib/state/fit_state.dart
+++ b/lib/state/fit_state.dart
@@ -143,7 +143,7 @@ class FitState extends FitCore
static String _themeFrom(Map<String, dynamic> data, {required String fallback}) {
final pref = data['theme'];
- if (pref is String && const ['system', 'dark', 'light'].contains(pref)) return pref;
+ if (pref is String && const ['system', 'dark', 'amoled', 'light'].contains(pref)) return pref;
final dark = data['dark'];
if (dark is bool) return dark ? 'dark' : 'light';
return fallback;
diff --git a/lib/state/settings_state.dart b/lib/state/settings_state.dart
index c2682fa..8983b27 100644
--- a/lib/state/settings_state.dart
+++ b/lib/state/settings_state.dart
@@ -7,7 +7,7 @@ mixin SettingsState on FitCore, ToolsState, LibraryState {
bool get dark => themePref == 'system'
? PlatformDispatcher.instance.platformBrightness == Brightness.dark
- : themePref == 'dark';
+ : themePref == 'dark' || themePref == 'amoled';
set dark(bool on) => themePref = on ? 'dark' : 'light';
@@ -59,7 +59,7 @@ mixin SettingsState on FitCore, ToolsState, LibraryState {
}
void setThemePref(String pref) {
- if (!const ['system', 'dark', 'light'].contains(pref)) return;
+ if (!const ['system', 'dark', 'amoled', 'light'].contains(pref)) return;
themePref = pref;
_persist();
_refreshWidgets();
diff --git a/lib/theme/app_colors.dart b/lib/theme/app_colors.dart
index 3a02d7f..98f5917 100644
--- a/lib/theme/app_colors.dart
+++ b/lib/theme/app_colors.dart
@@ -81,6 +81,33 @@ class GymColors extends ThemeExtension<GymColors> {
danger: Color(0xFFE5674C),
);
+ static const amoled = GymColors(
+ pageBg: Color(0xFF000000),
+ bg: Color(0xFF000000),
+ bgRaised: Color(0xFF111111),
+ bgRaised2: Color(0xFF1E1E1E),
+ border: Color(0xFF2E2E2E),
+ navBg: Color(0xE6000000),
+ text: Color(0xFFFFFFFF),
+ textSecondary: Color(0xFF9A9A9A),
+ textTertiary: Color(0xFF666666),
+ ember: Color(0xFFFFFFFF),
+ emberDeep: Color(0xFFD0D0D0),
+ onEmber: Color(0xFF000000),
+ emberSoft: Color(0x1AFFFFFF),
+ emberShadow: Color(0x80000000),
+ accent: Color(0xFFD9A184),
+ accentSoft: Color(0x29D9A184),
+ brass: Color(0xFFB98F72),
+ sage: Color(0xFF8FA377),
+ sageSoft: Color(0x298FA377),
+ mutedFill: Color(0xFF1A1A1A),
+ heatEmpty: Color(0xFF161616),
+ info: Color(0xFF7FA8C9),
+ warn: Color(0xFFE0B15A),
+ danger: Color(0xFFE5674C),
+ );
+
static const light = GymColors(
pageBg: Color(0xFFFFFEFD),
bg: Color(0xFFF7F4F0),
diff --git a/lib/theme/app_theme.dart b/lib/theme/app_theme.dart
index 7b6687c..0d36641 100644
--- a/lib/theme/app_theme.dart
+++ b/lib/theme/app_theme.dart
@@ -10,6 +10,7 @@ class AppTheme {
static const String round = 'Nunito';
static ThemeData get dark => _build(Brightness.dark, GymColors.dark);
+ static ThemeData get amoled => _build(Brightness.dark, GymColors.amoled);
static ThemeData get light => _build(Brightness.light, GymColors.light);
static ThemeData _build(Brightness brightness, GymColors gc) {