~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
582f39d4 — pyrossh

2 years ago 
fix fonts
Files changed (8) hide show
  1. assets/fonts/Roboto/Roboto-Bold.ttf +0 -0
  2. assets/fonts/Roboto/Roboto-Medium.ttf +0 -0
  3. assets/fonts/Roboto/Roboto-Regular.ttf +0 -0
  4. assets/fonts/SanFranciscoPro.ttf +0 -0
  5. lib/app.dart +14 -5
  6. lib/components/verse_view.dart +2 -1
  7. pubspec.yaml +6 -2
  8. scripts/scrape.dart +3 -0
assets/fonts/Roboto/Roboto-Bold.ttf ADDED
Binary file
assets/fonts/Roboto/Roboto-Medium.ttf ADDED
Binary file
assets/fonts/Roboto/Roboto-Regular.ttf ADDED
Binary file
assets/fonts/SanFranciscoPro.ttf DELETED
Binary file
lib/app.dart CHANGED
@@ -17,6 +17,7 @@ class App extends StatelessWidget {
17
17
  themeMode: darkMode.reactiveValue(context) ? ThemeMode.dark : ThemeMode.light,
18
18
  theme: ThemeData(
19
19
  useMaterial3: true,
20
+ fontFamily: "Roboto",
20
21
  visualDensity: VisualDensity.adaptivePlatformDensity,
21
22
  primaryColor: const Color(0xFF4C2323),
22
23
  primaryColorDark: const Color(0xFF3C1B1C),
@@ -59,6 +60,10 @@ class App extends StatelessWidget {
59
60
  ),
60
61
  textTheme: const TextTheme(
61
62
  bodyMedium: TextStyle(
63
+ fontSize: 16,
64
+ fontWeight: FontWeight.w400,
65
+ wordSpacing: 0,
66
+ letterSpacing: 0,
62
67
  color: Color(0xFF010101),
63
68
  ),
64
69
  headlineLarge: TextStyle(
@@ -74,9 +79,9 @@ class App extends StatelessWidget {
74
79
  ),
75
80
  labelMedium: TextStyle(
76
81
  fontSize: 12,
77
- fontWeight: FontWeight.w800,
82
+ fontWeight: FontWeight.w700,
78
83
  color: Color(0xFF9A1111),
79
- letterSpacing: 0.5,
84
+ letterSpacing: 0,
80
85
  ),
81
86
  ),
82
87
  ),
@@ -122,6 +127,10 @@ class App extends StatelessWidget {
122
127
  ),
123
128
  textTheme: const TextTheme(
124
129
  bodyMedium: TextStyle(
130
+ fontSize: 16,
131
+ fontWeight: FontWeight.w400,
132
+ wordSpacing: 0.5,
133
+ letterSpacing: 0.01,
125
134
  color: Color(0xFFBCBEC4),
126
135
  ),
127
136
  headlineLarge: TextStyle(
@@ -136,10 +145,10 @@ class App extends StatelessWidget {
136
145
  letterSpacing: 0.5,
137
146
  ),
138
147
  labelMedium: TextStyle(
139
- color: Color(0xFFBA50AB),
148
+ color: Color(0xFFBA50AB), //E24DE2
140
149
  fontSize: 12,
141
- fontWeight: FontWeight.w800,
150
+ fontWeight: FontWeight.w700,
142
- letterSpacing: 0.5,
151
+ letterSpacing: 0,
143
152
  ),
144
153
  ),
145
154
  ),
lib/components/verse_view.dart CHANGED
@@ -13,7 +13,8 @@ class VerseText extends StatelessWidget {
13
13
  final selected = isVerseSelected(context, index);
14
14
  final delta = fontSizeDelta.reactiveValue(context);
15
15
  final bodySize = Theme.of(context).textTheme.bodyMedium!.fontSize! + delta;
16
+ final weight =
16
- final weight = fontBold.reactiveValue(context) ? FontWeight.w600 : FontWeight.w500;
17
+ fontBold.reactiveValue(context) ? FontWeight.w600 : Theme.of(context).textTheme.bodyMedium!.fontWeight;
17
18
 
18
19
  onTap() {
19
20
  onVerseSelected(index);
pubspec.yaml CHANGED
@@ -39,10 +39,14 @@ flutter:
39
39
  - assets/
40
40
  - assets/bibles/
41
41
  fonts:
42
- - family: SanFranciscoPro
42
+ - family: Roboto
43
43
  fonts:
44
- - asset: assets/fonts/SanFranciscoPro.ttf
44
+ - asset: assets/fonts/Roboto/Roboto-Regular.ttf
45
45
  weight: 400
46
+ - asset: assets/fonts/Roboto/Roboto-Medium.ttf
47
+ weight: 500
48
+ - asset: assets/fonts/Roboto/Roboto-Bold.ttf
49
+ weight: 700
46
50
  # An image asset can refer to one or more resolution-specific "variants", see
47
51
  # https://flutter.dev/assets-and-images/#resolution-aware
48
52
 
scripts/scrape.dart CHANGED
@@ -101,6 +101,9 @@ Future<List<String>> fetchPage(int bookIndex, int chapterIndex) async {
101
101
  }
102
102
  if (recognisedClasses.contains(node.attributes["class"])) {
103
103
  // ex: verse 1 On that day // we don't want to add a leading space
104
+ final text = node.text!.trim();
105
+ // TODO: find if next character is , then remove space
106
+ // ex: GEN 10
104
107
  line += "${line.endsWith("|") ? "" : " "}${node.text!.trim()} ";
105
108
  }
106
109
  }