only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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

6cf602a8 — pyrossh

add light theme

Files changed (9) hide show

bible_app/lib/components/book_selector.dart +0 -1
bible_app/lib/components/books_list.dart +2 -4
bible_app/lib/components/chapters_list.dart +2 -1
bible_app/lib/components/header.dart +2 -3
bible_app/lib/components/play_button.dart +1 -1
bible_app/lib/components/sidebar.dart +6 -4
bible_app/lib/components/verse_view.dart +3 -3
bible_app/lib/models/theme.dart +52 -76
bible_app/lib/state.dart +2 -1

bible_app/lib/components/book_selector.dart CHANGED Viewed

@@ -31,7 +31,6 @@ class BookSelectorState extends State<BookSelector> {
   onChapterSelected(int index) {
     saveBookIndex(bookIndex, index);
     context.push("/${selectedBible.value[bookIndex].name}/$index");
-    context.pop();
   }
   @override

bible_app/lib/components/books_list.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "../state.dart";
 import "tile.dart";
 import "../models/book.dart";
@@ -16,10 +17,7 @@ class BooksList extends StatelessWidget {
       children: [
         Container(
           margin: const EdgeInsets.only(bottom: 20),
-          child: Text(
-            title,
-            style: Theme.of(context).textTheme.headlineMedium,
+          child: Text(title, style: theme.value.titleText),
-          ),
         ),
         Wrap(
           children: List.of(books.map((book) {

bible_app/lib/components/chapters_list.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import '../state.dart';
 import 'tile.dart';
 class ChaptersList extends StatelessWidget {
@@ -14,7 +15,7 @@ class ChaptersList extends StatelessWidget {
       children: [
         Container(
           margin: const EdgeInsets.only(bottom: 20),
-          child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
+          child: Text(title, style: theme.value.titleText),
         ),
         Wrap(
           children: List.generate(length, (index) {

bible_app/lib/components/header.dart CHANGED Viewed

@@ -18,8 +18,7 @@ class Header extends StatelessWidget {
     return Container(
       padding: EdgeInsets.symmetric(
           // horizontal: isDesktop() ? 40 : 20,
-          vertical: isDesktop() ? 15 : 0
+          vertical: isDesktop() ? 15 : 0),
-      ),
       decoration: const BoxDecoration(
         border: Border(bottom: BorderSide(width: 1.5)),
       ),
@@ -33,7 +32,7 @@ class Header extends StatelessWidget {
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                Text("${selectedBible.value[book].name} ${chapter + 1}", style: Theme.of(context).textTheme.headlineLarge),
+                Text("${selectedBible.value[book].name} ${chapter + 1}", style: theme.value.headerText),
                 Container(
                   margin: const EdgeInsets.only(left: 3),
                   child: Transform.rotate(

bible_app/lib/components/play_button.dart CHANGED Viewed

@@ -16,7 +16,7 @@ class PlayButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final icon = isPlaying.reactiveValue(context) ? Icons.pause_circle_filled : Icons.play_circle_fill;
     return IconButton(
-      padding: EdgeInsets.symmetric(horizontal: 50),
+      padding: const EdgeInsets.symmetric(horizontal: 50),
       icon: Icon(icon, size: 36),
       onPressed: () async {
         final player = AudioPlayer();

bible_app/lib/components/sidebar.dart CHANGED Viewed

@@ -1,5 +1,7 @@
 import "package:flutter/material.dart";
+import "../state.dart";
 class Sidebar extends StatelessWidget {
   const Sidebar({super.key});
@@ -32,10 +34,10 @@ class Sidebar extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Flexible(
-                      child: Text("KANNADA", style: Theme.of(context).textTheme.labelLarge),
+                      child: Text("KANNADA", style: theme.value.logoText),
                     ),
                     Flexible(
-                      child: Text("BIBLE", style: Theme.of(context).textTheme.labelLarge),
+                      child: Text("BIBLE", style: theme.value.logoText),
                     ),
                   ],
                 ),
@@ -92,7 +94,7 @@ class Bookmark extends StatelessWidget {
               width: 30.0,
               height: 80.0,
               decoration: BoxDecoration(
-                color: Theme.of(context).secondaryHeaderColor,
+                color: theme.value.secondaryColor,
                 borderRadius: const BorderRadius.only(
                   topLeft: Radius.circular(4),
                   topRight: Radius.circular(4),
@@ -101,7 +103,7 @@ class Bookmark extends StatelessWidget {
             ),
             CustomPaint(
               painter: TrianglePainter(
-                color: Theme.of(context).secondaryHeaderColor,
+                color: theme.value.secondaryColor,
               ),
             ),
           ],

bible_app/lib/components/verse_view.dart CHANGED Viewed

@@ -20,7 +20,7 @@ class VerseText extends StatelessWidget {
           onTap: onTap,
           child: Container(
             decoration: BoxDecoration(
-              color: selected ? Theme.of(context).highlightColor : Colors.white,
+              color: selected ? theme.value.highlightColor : Colors.white,
             ),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -29,11 +29,11 @@ class VerseText extends StatelessWidget {
                   margin: const EdgeInsets.only(right: 4),
                   child:  Transform.translate(
                     offset: const Offset(0, 2),
-                    child: Text("${index + 1}", style: Theme.of(context).textTheme.labelSmall),
+                    child: Text("${index + 1}", style: theme.value.labelText),
                   ),
                 ),
                 Flexible(
-                  child: Text(text, style: Theme.of(context).textTheme.bodyMedium),
+                  child: Text(text, style: theme.value.bodyText),
                 )
               ],
             ),

bible_app/lib/models/theme.dart CHANGED Viewed

@@ -1,89 +1,65 @@
-import "dart:ui";
 import "package:flutter/material.dart";
+const lightPrimary = Color(0xFF4C2323);
+const lightPrimaryLighter = Color(0xFF3C1B1C);
+const lightSecondary = Color(0xFFFFB341);
+const lightTertiary = Color(0xFF4C2323);
-class ThemeColors {
+const lightHeadline = Color(0xFF010101);
-  final Color primary;
+const lightLabel = Color(0xFF9A1111);
+const lightBody = Color(0xFF010101);
+const lightHighlightColor = Color(0xAAF8D0DC);
+class AppTheme {
-  const ThemeColors({
+  const AppTheme({
+    required this.labelText,
-    required this.primary,
+    required this.logoText,
-    // required Color primaryLight,
-    // required Color secondary,
+    required this.bodyText,
-    // required Color tertiary,
-    // required Color headerText,
+    required this.headerText,
-    // required Color verseNo,
-    // required Color verseText,
+    required this.titleText,
+    required this.secondaryColor,
+    required this.highlightColor,
   });
-}
+  final TextStyle labelText;
-class Theme {
+  final TextStyle logoText;
-  const Theme({required TextStyle body});
+  final TextStyle bodyText;
+  final TextStyle headerText;
+  final TextStyle titleText;
+  final Color secondaryColor;
+  final Color highlightColor;
 }
-const lightColors = ThemeColors(
-  primary: Color(0xFF4C2323),
-  // primaryLight: Color(0xFF3C1B1C),
-  // secondary: Color(0xFFFFB341),
-  // tertiary: Color(0xFF4C2323),
-  // headerText:  Color(0xFF010101),
-  // verseNo: Color(0xFF9A1111),
-  // verseText: Color(0xFF010101),
-);
-const lightPrimary = Color(0xFF4C2323);
-const lightTheme = Theme(
+const lightTheme = AppTheme(
+  secondaryColor: lightSecondary,
+  highlightColor: lightHighlightColor,
+  labelText: TextStyle(
+    fontFamily: "SanFrancisco",
+    fontSize: 12,
+    fontWeight: FontWeight.w800,
+    color: lightLabel,
+    letterSpacing: 0.5,
+  ),
+  logoText: TextStyle(
+    fontSize: 38,
+    fontWeight: FontWeight.w700,
+    color: lightSecondary,
+  ),
-  body: TextStyle(
+  bodyText: TextStyle(
-    color: Colors.red,
+    color: lightBody,
     fontSize: 16,
     fontFamily: "SanFranciscoPro",
     fontWeight: FontWeight.w400,
     // letterSpacing: 0.5,
   ),
-);
-final darkTheme = ThemeData(
-  brightness: Brightness.light,
-  primaryColor: const Color(0xFF4C2323),
-  secondaryHeaderColor: const Color(0xFFFFB341),
-  highlightColor: const Color(0xAAF8D0DC),
-  fontFamily: "SanFranciscoPro",
-  textTheme: const TextTheme(
-    bodyMedium: TextStyle(
+  headerText: TextStyle(
-      color: Color(0xFF010101),
+    color: lightBody,
-      fontSize: 16,
+    fontSize: 20,
-      fontFamily: "SanFranciscoPro",
-      fontWeight: FontWeight.w400,
+    fontWeight: FontWeight.w500,
-// letterSpacing: 0.5,
+    letterSpacing: 0.5,
-    ),
+  ),
-    headlineLarge: TextStyle(
+  titleText: TextStyle(
-      color: Colors.black,
+    color: lightBody,
+    fontWeight: FontWeight.w600,
-      fontSize: 20,
+    fontSize: 20,
-      fontWeight: FontWeight.w500,
-      letterSpacing: 0.5,
-    ),
-    headlineMedium: TextStyle(
-      color: Colors.black,
-      fontWeight: FontWeight.w600,
-      fontSize: 20,
-    ),
-    labelMedium: TextStyle(
-      fontFamily: "SanFrancisco",
-      fontSize: 18,
-      fontWeight: FontWeight.w600,
-      color: Colors.black,
-      letterSpacing: 0.5,
-    ),
-    labelSmall: TextStyle(
-      fontFamily: "SanFrancisco",
-      fontSize: 12,
-      fontWeight: FontWeight.w800,
-      color: Color(0xFF9A1111),
-      letterSpacing: 0.5,
-    ),
-    labelLarge: TextStyle(
-      fontSize: 38,
-      fontWeight: FontWeight.w700,
-      color: Color(0xFFFFB341),
-    ),
   ),
-);
+);

bible_app/lib/state.dart CHANGED Viewed

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart';
 import 'package:flutter_reactive_value/flutter_reactive_value.dart';
 import 'models/book.dart';
+import 'models/theme.dart';
 final darkMode = PersistentValueNotifier<bool>(
   sharedPreferencesKey: 'darkMode',
@@ -29,7 +30,7 @@ final chapterIndex = PersistentValueNotifier<int>(
 final selectedBible = ValueNotifier<List<Book>>([]);
 final selectedVerses = ValueNotifier([]);
 final isPlaying = ValueNotifier(false);
-// final theme = ValueNotifier<ThemeData>();
+final theme = ValueNotifier<AppTheme>(lightTheme);
 saveBookIndex(int book, int chapter) {
   bookIndex.value = book;

~repos /only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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