~repos /only-bible-app

#kotlin#android#ios

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.

Readme
|
Commits
|
Files
d2169018 — pyrossh

2 years ago 
improve colors
Files changed (6) hide show
  1. lib/app.dart +12 -1
  2. lib/components/book_selector.dart +2 -2
  3. lib/components/books_list.dart +1 -1
  4. lib/components/chapters_list.dart +1 -1
  5. lib/components/menu.dart +2 -1
  6. lib/routes/home_screen.dart +1 -0
lib/app.dart CHANGED
@@ -16,22 +16,28 @@ class App extends StatelessWidget {
16
16
  builder: OneContext().builder,
17
17
  themeMode: darkMode.reactiveValue(context) ? ThemeMode.dark : ThemeMode.light,
18
18
  theme: ThemeData(
19
+ useMaterial3: true,
19
20
  visualDensity: VisualDensity.adaptivePlatformDensity,
20
21
  primaryColor: const Color(0xFF4C2323),
21
22
  primaryColorDark: const Color(0xFF3C1B1C),
22
23
  primaryColorLight: const Color(0xFF7F3D3C),
23
24
  secondaryHeaderColor: const Color(0xFFFFB341),
24
25
  highlightColor: const Color(0xAAF8D0DC),
26
+ hoverColor: const Color(0xAAF8D0DC),
25
27
  dividerColor: Colors.black,
26
28
  shadowColor: Colors.black,
27
29
  popupMenuTheme: const PopupMenuThemeData(
28
30
  elevation: 4,
31
+ color: Colors.white,
32
+ shadowColor: Colors.black,
33
+ surfaceTintColor: Color(0xAAF8D0DC),
29
34
  ),
30
35
  colorScheme: const ColorScheme.light(
31
36
  background: Colors.white,
32
37
  ),
33
38
  textButtonTheme: TextButtonThemeData(
34
39
  style: TextButton.styleFrom(
40
+ enableFeedback: true,
35
41
  padding: EdgeInsets.zero,
36
42
  shape: const RoundedRectangleBorder(),
37
43
  elevation: isWide(context) ? 1 : 0.5,
@@ -70,22 +76,27 @@ class App extends StatelessWidget {
70
76
  ),
71
77
  ),
72
78
  darkTheme: ThemeData(
79
+ useMaterial3: true,
73
80
  visualDensity: VisualDensity.adaptivePlatformDensity,
74
81
  primaryColor: const Color(0xFF2D0B0B),
75
82
  primaryColorDark: const Color(0xFF260909),
76
83
  primaryColorLight: const Color(0xFF481514),
77
84
  secondaryHeaderColor: const Color(0xFFFFC351),
78
85
  highlightColor: const Color(0xAA5D4979),
86
+ hoverColor: const Color(0xAA5D4979),
79
87
  dividerColor: Colors.white,
80
88
  shadowColor: Colors.white,
81
89
  popupMenuTheme: const PopupMenuThemeData(
82
- elevation: 2,
90
+ elevation: 4,
91
+ color: Colors.black,
92
+ surfaceTintColor: Color(0xAA5D4979),
83
93
  ),
84
94
  colorScheme: const ColorScheme.dark(
85
95
  background: Color(0xFF1F1F22),
86
96
  ),
87
97
  textButtonTheme: TextButtonThemeData(
88
98
  style: TextButton.styleFrom(
99
+ enableFeedback: true,
89
100
  padding: EdgeInsets.zero,
90
101
  shape: const RoundedRectangleBorder(),
91
102
  elevation: isWide(context) ? 1 : 0.5,
lib/components/book_selector.dart CHANGED
@@ -37,7 +37,7 @@ class BookSelectorState extends State<BookSelector> {
37
37
  if (tab == 1) {
38
38
  final book = selectedBible.value[bookIndex];
39
39
  return Container(
40
- margin: const EdgeInsets.only(top: 15, left: 20),
40
+ margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
41
41
  child: ChaptersList(
42
42
  title: book.name,
43
43
  length: book.chapters.length,
@@ -48,7 +48,7 @@ class BookSelectorState extends State<BookSelector> {
48
48
  final oldTestament = selectedBible.value.where((it) => it.isOldTestament()).toList();
49
49
  final newTestament = selectedBible.value.where((it) => it.isNewTestament()).toList();
50
50
  return Container(
51
- margin: const EdgeInsets.only(top: 15, left: 20),
51
+ margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
52
52
  child: ListView(
53
53
  children: [
54
54
  BooksList(
lib/components/books_list.dart CHANGED
@@ -33,7 +33,7 @@ class BooksList extends StatelessWidget {
33
33
  ),
34
34
  if (showClose)
35
35
  Container(
36
- margin: const EdgeInsets.only(right: 30),
36
+ margin: EdgeInsets.only(right: isWide(context) ? 30 : 10),
37
37
  child: IconButton(
38
38
  icon: const Icon(Icons.close, size: 28),
39
39
  onPressed: () {
lib/components/chapters_list.dart CHANGED
@@ -27,7 +27,7 @@ class ChaptersList extends StatelessWidget {
27
27
  child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
28
28
  ),
29
29
  Container(
30
- margin: const EdgeInsets.only(right: 30),
30
+ margin: EdgeInsets.only(right: isWide(context) ? 30 : 10),
31
31
  child: IconButton(
32
32
  icon: const Icon(Icons.close, size: 28),
33
33
  onPressed: () {
lib/components/menu.dart CHANGED
@@ -30,7 +30,8 @@ class Menu extends StatelessWidget {
30
30
  onPressed: toggleMode,
31
31
  ),
32
32
  Container(margin: const EdgeInsets.only(top: spacing)),
33
+ // TODO: figure out bold active/inactive color
33
- IconButton(
34
+ const IconButton(
34
35
  icon: Icon(Icons.format_bold, size: 28),
35
36
  onPressed: toggleBold,
36
37
  ),
lib/routes/home_screen.dart CHANGED
@@ -77,6 +77,7 @@ class VerseList extends StatelessWidget {
77
77
  final verses = selectedBook.chapters[chapterIndex.value].verses;
78
78
  return SelectionArea(
79
79
  child: ListView.builder(
80
+ shrinkWrap: false,
80
81
  padding: const EdgeInsets.only(
81
82
  left: 20,
82
83
  right: 20,