only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

e7a9274f — pyrossh

Improve theming

Files changed (8) hide show

lib/app.dart +20 -17
lib/main.dart +2 -1
lib/sheets/actions_sheet.dart +2 -2
lib/store/app_navigator.dart +49 -20
lib/theme.dart +31 -12
lib/widgets/chapter_app_bar.dart +15 -4
lib/widgets/sliver_heading.dart +8 -1
lib/widgets/verses_view.dart +1 -1

lib/app.dart CHANGED Viewed

@@ -15,14 +15,19 @@ import "package:only_bible_app/utils.dart";
 class App extends StatelessWidget {
   final GlobalKey<NavigatorState> globalNavigatorKey;
   final Store<AppState> store;
+  final AppNavigator navigator;
   late final GoRouter _router;
-  App({super.key, required this.globalNavigatorKey, required this.store}) {
+  App({super.key, required this.globalNavigatorKey, required this.store, required this.navigator}) {
     final s = store.state;
     _router = GoRouter(
       navigatorKey: globalNavigatorKey,
       initialLocation:
           s.firstOpen ? "/bible" : "/chapter/${Uri.encodeComponent(s.bibleName)}/${s.savedBook}/${s.savedChapter}",
+      redirect: (context, state) {
+        navigator.hideActions();
+        return null;
+      },
       routes: [
         GoRoute(
           path: "/bible",
@@ -102,23 +107,21 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return StoreProvider<AppState>(
+    return AppNavigatorProvider(
       store: store,
-      child: AppNavigatorProvider(
-        navigator: AppNavigator(),
+      navigator: navigator,
-        child: StoreConnector<AppState, _AppVm>(
+      child: StoreConnector<AppState, _AppVm>(
-          vm: () => _AppVmFactory(),
+        vm: () => _AppVmFactory(),
-          builder: (context, vm) => MaterialApp.router(
+        builder: (context, vm) => MaterialApp.router(
-            routerConfig: _router,
+          routerConfig: _router,
-            onGenerateTitle: (context) => context.l.title,
+          onGenerateTitle: (context) => context.l.title,
-            localizationsDelegates: AppLocalizations.localizationsDelegates,
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
-            supportedLocales: AppLocalizations.supportedLocales,
+          supportedLocales: AppLocalizations.supportedLocales,
-            debugShowCheckedModeBanner: false,
+          debugShowCheckedModeBanner: false,
-            themeMode: vm.darkMode ? ThemeMode.dark : ThemeMode.light,
+          themeMode: vm.darkMode ? ThemeMode.dark : ThemeMode.light,
-            theme: lightTheme,
+          theme: lightTheme,
-            darkTheme: darkTheme,
+          darkTheme: darkTheme,
-            locale: Locale(vm.languageCode),
+          locale: Locale(vm.languageCode),
-          ),
         ),
       ),
     );

lib/main.dart CHANGED Viewed

@@ -74,6 +74,7 @@ void main() async {
   );
   updateStatusBar(store.state.darkMode);
   await store.dispatchAndWait(LoadBibleAction());
+  final navigator = AppNavigator(store);
-  runApp(App(globalNavigatorKey: globalNavigatorKey, store: store));
+  runApp(App(globalNavigatorKey: globalNavigatorKey, store: store, navigator: navigator));
   FlutterNativeSplash.remove();
 }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -23,7 +23,7 @@ class ActionsSheet extends StatelessWidget {
           index,
         ),
       );
-      context.nav.hideActions(context);
+      context.nav.hideActions();
     }
     return Material(
@@ -44,7 +44,7 @@ class ActionsSheet extends StatelessWidget {
                     List<Verse>.from(context.state.selectedVerses),
                   ),
                 );
-                context.nav.hideActions(context);
+                context.nav.hideActions();
               },
               icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
             ),

lib/store/app_navigator.dart CHANGED Viewed

@@ -1,3 +1,4 @@
+import "package:async_redux/async_redux.dart" show Store, StoreProvider;
 import "package:flutter/material.dart";
 import "package:app_review/app_review.dart";
 import "package:go_router/go_router.dart";
@@ -9,21 +10,44 @@ import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:share_plus/share_plus.dart";
-class AppNavigatorProvider extends InheritedWidget {
+class AppNavigatorProvider extends StatelessWidget {
+  final Store<AppState> store;
   final AppNavigator navigator;
+  final Widget child;
   const AppNavigatorProvider({
     super.key,
+    required this.store,
     required this.navigator,
-    required super.child,
+    required this.child,
   });
   static AppNavigator of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<AppNavigatorProvider>()!.navigator;
+    return context.dependOnInheritedWidgetOfExactType<_InheritedAppNavigator>()!.navigator;
   }
   @override
+  Widget build(BuildContext context) {
+    return StoreProvider<AppState>(
+      store: store,
+      child: _InheritedAppNavigator(
+        navigator: navigator,
+        child: child,
+      ),
+    );
+  }
+}
+class _InheritedAppNavigator extends InheritedWidget {
+  final AppNavigator navigator;
+  const _InheritedAppNavigator({
+    required this.navigator,
+    required super.child,
+  });
+  @override
-  bool updateShouldNotify(AppNavigatorProvider oldWidget) => false;
+  bool updateShouldNotify(_InheritedAppNavigator oldWidget) => false;
 }
 extension AppNavigatorContext on BuildContext {
@@ -31,8 +55,11 @@ extension AppNavigatorContext on BuildContext {
 }
 class AppNavigator {
+  final Store<AppState> store;
   OverlayEntry? _actionsOverlay;
+  AppNavigator(this.store);
   String _chapterPath(String bibleName, int book, int chapter) {
     return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
   }
@@ -44,12 +71,12 @@ class AppNavigator {
     int chapter,
     TextDirection? dir,
   ) {
-    context.dispatch(UpdateChapterAction(book, chapter));
+    store.dispatch(UpdateChapterAction(book, chapter));
-    if (context.state.isPlaying) {
+    if (store.state.isPlaying) {
       AppState.player.pause();
-      context.dispatch(SetPlayingAction(false));
+      store.dispatch(SetPlayingAction(false));
     }
-    hideActions(context);
+    hideActions();
     context.push(_chapterPath(bibleName, book, chapter), extra: dir);
   }
@@ -59,12 +86,12 @@ class AppNavigator {
     int book,
     int chapter,
   ) {
-    context.dispatch(UpdateChapterAction(book, chapter));
+    store.dispatch(UpdateChapterAction(book, chapter));
-    if (context.state.isPlaying) {
+    if (store.state.isPlaying) {
       AppState.player.pause();
-      context.dispatch(SetPlayingAction(false));
+      store.dispatch(SetPlayingAction(false));
     }
-    hideActions(context);
+    hideActions();
     context.go(_chapterPath(bibleName, book, chapter));
   }
@@ -151,9 +178,9 @@ class AppNavigator {
     int book,
     int chapter,
   ) async {
-    hideActions(context);
+    hideActions();
-    await context.dispatchAndWait(UpdateBibleAction(name, code));
+    await store.dispatchAndWait(UpdateBibleAction(name, code));
-    await context.dispatchAndWait(LoadBibleAction());
+    await store.dispatchAndWait(LoadBibleAction());
     context.go(_chapterPath(name, book, chapter));
   }
@@ -190,7 +217,7 @@ class AppNavigator {
         text: "$title\n$text",
       ),
     );
-    hideActions(context);
+    hideActions();
   }
   void showSettings(BuildContext context, Bible bible) {
@@ -223,9 +250,11 @@ class AppNavigator {
     overlay.insert(_actionsOverlay!);
   }
-  void hideActions(BuildContext context) {
+  void hideActions() {
+    if (_actionsOverlay != null) {
-    _actionsOverlay?.remove();
+      _actionsOverlay?.remove();
-    _actionsOverlay = null;
+      _actionsOverlay = null;
-    context.dispatch(ClearSelectedVersesAction());
+      store.dispatch(ClearSelectedVersesAction());
+    }
   }
 }

lib/theme.dart CHANGED Viewed

@@ -128,11 +128,17 @@ final lightTheme = ThemeData(
     style: TextButton.styleFrom(
       enableFeedback: true,
       padding: EdgeInsets.zero,
-      shape: const RoundedRectangleBorder(),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(4),
+        side: BorderSide(
+          color: Colors.black,
+          width: 1,
+        ),
+      ),
-      elevation: 0.5,
+      elevation: 2,
       shadowColor: Colors.black,
-      backgroundColor: const Color(0xFFEAE9E9),
-      foregroundColor: lightColorScheme.primary,
+      backgroundColor: lightColorScheme.surface,
+      foregroundColor: Colors.black,
       textStyle: const TextStyle(
         fontSize: 18,
         fontWeight: FontWeight.w500,
@@ -235,17 +241,30 @@ final darkTheme = lightTheme.copyWith(
     ),
   ),
   textButtonTheme: TextButtonThemeData(
-    style: ButtonStyle(
+    style: TextButton.styleFrom(
       enableFeedback: lightTheme.textButtonTheme.style!.enableFeedback,
-      padding: lightTheme.textButtonTheme.style!.padding,
-      shape: lightTheme.textButtonTheme.style!.shape,
-      textStyle: lightTheme.textButtonTheme.style!.textStyle,
-      elevation: WidgetStateProperty.all(1),
+      padding: EdgeInsets.all(0),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(4),
+        side: BorderSide(
+          color: darkColorScheme.onSurface,
+          width: 1,
+        ),
+      ),
+      textStyle: const TextStyle(
+        fontSize: 18,
+        fontWeight: FontWeight.w500,
+        letterSpacing: 0,
+      ),
+      elevation: 0,
-      shadowColor: WidgetStateProperty.all(Colors.white),
+      shadowColor: Colors.white,
-      backgroundColor: WidgetStateProperty.all(darkColorScheme.tertiary),
+      backgroundColor: darkColorScheme.surface,
-      foregroundColor: WidgetStateProperty.all(darkColorScheme.primary),
+      foregroundColor: darkColorScheme.primary,
     ),
   ),
+  //   shadowColor: Colors.black,
+  //     backgroundColor: lightColorScheme.surface,
+  //     foregroundColor: Colors.black,
   textTheme: TextTheme(
     bodyMedium: lightTheme.textTheme.bodyMedium!.copyWith(
       color: darkColorScheme.onSurface,

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -30,14 +30,25 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => context.nav.changeChapter(context, bible, book, book.index),
-              onLongPress: () => context.nav.changeBook(context, bible),
+              onTap: () => context.nav.changeBook(context, bible),
               child: Text(
-                "$bookName ${chapter.index + 1}",
+                bookName,
                 style: Theme.of(context).textTheme.headlineMedium,
                 key: const Key("bookTitle"),
               ),
             ),
+            InkWell(
+              enableFeedback: true,
+              onTap: () => context.nav.changeChapter(context, bible, book, book.index),
+              child: Padding(
+                padding: const EdgeInsets.only(left: 16),
+                child: Text(
+                  "${chapter.index + 1}",
+                  style: Theme.of(context).textTheme.headlineMedium,
+                  key: const Key("chapterTitle"),
+                ),
+              ),
+            ),
             Expanded(
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
@@ -46,7 +57,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                     padding: const EdgeInsets.only(left: 10),
                     child: IconButton(
                       padding: EdgeInsets.zero,
-                      icon: const Icon(Icons.more_vert, size: 24),
+                      icon: const Icon(Icons.more_vert, size: 28),
                       onPressed: () => context.nav.showSettings(context, bible),
                     ),
                   ),

lib/widgets/sliver_heading.dart CHANGED Viewed

@@ -27,7 +27,14 @@ class SliverHeading extends StatelessWidget {
             Expanded(
               child: Text(
                 title,
-                style: Theme.of(context).textTheme.headlineMedium,
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                  shadows: [
+                    Shadow(
+                      color: Theme.of(context).shadowColor.withOpacity(0.3),
+                      offset: const Offset(1, 1),
+                    ),
+                  ],
+                ),
               ),
             ),
             if (showClose)

lib/widgets/verses_view.dart CHANGED Viewed

@@ -16,7 +16,7 @@ class VersesView extends StatelessWidget {
     if (context.state.selectedVerses.isNotEmpty) {
       context.nav.showActions(context, bible);
     } else {
-      context.nav.hideActions(context);
+      context.nav.hideActions();
     }
   }

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git Discussions: https://groups.google.com/g/rust-embed-devs

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs