~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
c1486dac — pyrossh

1 year ago 
fix theme
Files changed (10) hide show
  1. app/build.gradle.kts +0 -1
  2. app/src/main/java/dev/pyrossh/onlyBible/AppTheme.kt +3 -13
  3. app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt +2 -6
  4. app/src/main/java/dev/pyrossh/onlyBible/composables/VerseText.kt +6 -3
  5. app/src/main/java/dev/pyrossh/onlyBible/domain/Verse.kt +1 -4
  6. app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Color.kt +225 -0
  7. app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Theme.kt +246 -0
  8. app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Type.kt +8 -0
  9. build.gradle.kts +0 -1
  10. gradle/libs.versions.toml +0 -1
app/build.gradle.kts CHANGED
@@ -11,7 +11,6 @@ plugins {
11
11
  alias(libs.plugins.compose.compiler)
12
12
  alias(libs.plugins.jetbrains.kotlin.android)
13
13
  alias(libs.plugins.kotlinx.serializer)
14
- alias(libs.plugins.kotlin.parcelize)
15
14
  alias(libs.plugins.secrets.gradle.plugin)
16
15
  }
17
16
 
app/src/main/java/dev/pyrossh/onlyBible/AppTheme.kt CHANGED
@@ -5,8 +5,6 @@ import androidx.activity.SystemBarStyle
5
5
  import androidx.activity.enableEdgeToEdge
6
6
  import androidx.compose.foundation.isSystemInDarkTheme
7
7
  import androidx.compose.material3.MaterialTheme
8
- import androidx.compose.material3.dynamicDarkColorScheme
9
- import androidx.compose.material3.dynamicLightColorScheme
10
8
  import androidx.compose.runtime.Composable
11
9
  import androidx.compose.runtime.LaunchedEffect
12
10
  import androidx.compose.ui.graphics.Color
@@ -14,6 +12,8 @@ import androidx.compose.ui.graphics.toArgb
14
12
  import androidx.compose.ui.platform.LocalContext
15
13
  import androidx.compose.ui.text.font.FontFamily
16
14
  import androidx.compose.ui.text.font.GenericFontFamily
15
+ import dev.pyrossh.onlyBible.ui.theme.darkScheme
16
+ import dev.pyrossh.onlyBible.ui.theme.lightScheme
17
17
 
18
18
  enum class ThemeType {
19
19
  Light,
@@ -58,17 +58,7 @@ fun AppTheme(
58
58
  ) {
59
59
  val context = LocalContext.current as ComponentActivity
60
60
  val isLight = isLightTheme(themeType, isSystemInDarkTheme())
61
- val colorScheme = if (isLight)
61
+ val colorScheme = if (isLight) lightScheme else darkScheme
62
- dynamicLightColorScheme(context).copy(
63
- onSurface = Color.Black,
64
- outline = Color.LightGray,
65
- )
66
- else
67
- dynamicDarkColorScheme(context).copy(
68
- background = Color(0xFF090F12),
69
- surface = Color(0xFF090F12),
70
- outline = Color(0xAA5D4979),
71
- )
72
62
  LaunchedEffect(key1 = themeType) {
73
63
  context.enableEdgeToEdge(
74
64
  statusBarStyle = if (isLight) {
app/src/main/java/dev/pyrossh/onlyBible/ChapterScreen.kt CHANGED
@@ -1,6 +1,5 @@
1
1
  package dev.pyrossh.onlyBible
2
2
 
3
- import android.os.Parcelable
4
3
  import android.view.SoundEffectConstants
5
4
  import androidx.compose.animation.AnimatedContentTransitionScope
6
5
  import androidx.compose.foundation.layout.Arrangement
@@ -48,20 +47,17 @@ import dev.pyrossh.onlyBible.composables.VerseHeading
48
47
  import dev.pyrossh.onlyBible.composables.VerseText
49
48
  import dev.pyrossh.onlyBible.utils.LocalNavController
50
49
  import dev.pyrossh.onlyBible.utils.detectSwipe
51
- import kotlinx.parcelize.Parcelize
52
50
  import kotlinx.serialization.Serializable
53
51
 
54
52
  @Serializable
55
- @Parcelize
56
53
  data class ChapterScreenProps(
57
54
  val bookIndex: Int,
58
55
  val chapterIndex: Int,
59
56
  val verseIndex: Int,
60
57
  val dir: String = Dir.Left.name,
61
- ) : Parcelable
58
+ )
62
59
 
63
- @Parcelize
64
- enum class Dir : Parcelable {
60
+ enum class Dir {
65
61
  Left, Right;
66
62
 
67
63
  fun slideDirection(): AnimatedContentTransitionScope.SlideDirection {
app/src/main/java/dev/pyrossh/onlyBible/composables/VerseText.kt CHANGED
@@ -112,7 +112,7 @@ fun VerseText(
112
112
  },
113
113
  style = TextStyle(
114
114
  background = if (isSelected)
115
- MaterialTheme.colorScheme.outline
115
+ MaterialTheme.colorScheme.outlineVariant
116
116
  else
117
117
  if (highlightedColorIndex != null && isLight)
118
118
  currentHighlightColors[highlightedColorIndex]
@@ -191,8 +191,11 @@ private fun Menu(
191
191
  offset = IntOffset(0, y = barYPosition),
192
192
  ) {
193
193
  Surface(
194
+ color = MaterialTheme.colorScheme.surface,
195
+ shadowElevation = 0.5.dp,
196
+ tonalElevation = 0.5.dp,
194
197
  modifier = Modifier
195
- .width(360.dp)
198
+ .width(if (highlightWord != null) 360.dp else 300.dp)
196
199
  .height(56.dp)
197
200
  .border(
198
201
  width = 1.dp,
@@ -234,7 +237,7 @@ private fun Menu(
234
237
  .size(20.dp)
235
238
  .border(
236
239
  width = 1.dp,
237
- color = MaterialTheme.colorScheme.onBackground,
240
+ color = MaterialTheme.colorScheme.outline,
238
241
  shape = RoundedCornerShape(24.dp)
239
242
  ),
240
243
  imageVector = Icons.Filled.Circle,
app/src/main/java/dev/pyrossh/onlyBible/domain/Verse.kt CHANGED
@@ -1,7 +1,5 @@
1
1
  package dev.pyrossh.onlyBible.domain
2
2
 
3
- import android.os.Parcelable
4
- import kotlinx.parcelize.Parcelize
5
3
  import kotlinx.serialization.Serializable
6
4
 
7
5
  data class Bible(
@@ -170,7 +168,6 @@ val chapterSizes = listOf(
170
168
  )
171
169
 
172
170
  @Serializable
173
- @Parcelize
174
171
  data class Verse(
175
172
  val id: String,
176
173
  val bookIndex: Int,
@@ -179,4 +176,4 @@ data class Verse(
179
176
  val verseIndex: Int,
180
177
  val heading: String,
181
178
  val text: String,
182
- ) : Parcelable
179
+ )
app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Color.kt ADDED
@@ -0,0 +1,225 @@
1
+ package dev.pyrossh.onlyBible.ui.theme
2
+ import androidx.compose.ui.graphics.Color
3
+
4
+ val primaryLight = Color(0xFF495D92)
5
+ val onPrimaryLight = Color(0xFFFFFFFF)
6
+ val primaryContainerLight = Color(0xFFDAE2FF)
7
+ val onPrimaryContainerLight = Color(0xFF001848)
8
+ val secondaryLight = Color(0xFF4C5C92)
9
+ val onSecondaryLight = Color(0xFFFFFFFF)
10
+ val secondaryContainerLight = Color(0xFFDCE1FF)
11
+ val onSecondaryContainerLight = Color(0xFF02174B)
12
+ val tertiaryLight = Color(0xFF7D4E7D)
13
+ val onTertiaryLight = Color(0xFFFFFFFF)
14
+ val tertiaryContainerLight = Color(0xFFFFD6FA)
15
+ val onTertiaryContainerLight = Color(0xFF320935)
16
+ val errorLight = Color(0xFFBA1A1A)
17
+ val onErrorLight = Color(0xFFFFFFFF)
18
+ val errorContainerLight = Color(0xFFFFDAD6)
19
+ val onErrorContainerLight = Color(0xFF410002)
20
+ val backgroundLight = Color(0xFFFAF8FF)
21
+ val onBackgroundLight = Color(0xFF1A1B21)
22
+ val surfaceLight = Color(0xFFFAF8FF)
23
+ val onSurfaceLight = Color(0xFF1A1B21)
24
+ val surfaceVariantLight = Color(0xFFE1E2EC)
25
+ val onSurfaceVariantLight = Color(0xFF45464F)
26
+ val outlineLight = Color(0xFF757780)
27
+ val outlineVariantLight = Color(0xFFC5C6D0)
28
+ val scrimLight = Color(0xFF000000)
29
+ val inverseSurfaceLight = Color(0xFF2F3036)
30
+ val inverseOnSurfaceLight = Color(0xFFF1F0F7)
31
+ val inversePrimaryLight = Color(0xFFB2C5FF)
32
+ val surfaceDimLight = Color(0xFFDAD9E0)
33
+ val surfaceBrightLight = Color(0xFFFAF8FF)
34
+ val surfaceContainerLowestLight = Color(0xFFFFFFFF)
35
+ val surfaceContainerLowLight = Color(0xFFF4F3FA)
36
+ val surfaceContainerLight = Color(0xFFEEEDF4)
37
+ val surfaceContainerHighLight = Color(0xFFE8E7EF)
38
+ val surfaceContainerHighestLight = Color(0xFFE3E2E9)
39
+
40
+ val primaryLightMediumContrast = Color(0xFF2C4174)
41
+ val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
42
+ val primaryContainerLightMediumContrast = Color(0xFF5F73AA)
43
+ val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
44
+ val secondaryLightMediumContrast = Color(0xFF304074)
45
+ val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
46
+ val secondaryContainerLightMediumContrast = Color(0xFF6272AA)
47
+ val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
48
+ val tertiaryLightMediumContrast = Color(0xFF5F325F)
49
+ val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
50
+ val tertiaryContainerLightMediumContrast = Color(0xFF966394)
51
+ val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
52
+ val errorLightMediumContrast = Color(0xFF8C0009)
53
+ val onErrorLightMediumContrast = Color(0xFFFFFFFF)
54
+ val errorContainerLightMediumContrast = Color(0xFFDA342E)
55
+ val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
56
+ val backgroundLightMediumContrast = Color(0xFFFAF8FF)
57
+ val onBackgroundLightMediumContrast = Color(0xFF1A1B21)
58
+ val surfaceLightMediumContrast = Color(0xFFFAF8FF)
59
+ val onSurfaceLightMediumContrast = Color(0xFF1A1B21)
60
+ val surfaceVariantLightMediumContrast = Color(0xFFE1E2EC)
61
+ val onSurfaceVariantLightMediumContrast = Color(0xFF41424B)
62
+ val outlineLightMediumContrast = Color(0xFF5D5F67)
63
+ val outlineVariantLightMediumContrast = Color(0xFF797A83)
64
+ val scrimLightMediumContrast = Color(0xFF000000)
65
+ val inverseSurfaceLightMediumContrast = Color(0xFF2F3036)
66
+ val inverseOnSurfaceLightMediumContrast = Color(0xFFF1F0F7)
67
+ val inversePrimaryLightMediumContrast = Color(0xFFB2C5FF)
68
+ val surfaceDimLightMediumContrast = Color(0xFFDAD9E0)
69
+ val surfaceBrightLightMediumContrast = Color(0xFFFAF8FF)
70
+ val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
71
+ val surfaceContainerLowLightMediumContrast = Color(0xFFF4F3FA)
72
+ val surfaceContainerLightMediumContrast = Color(0xFFEEEDF4)
73
+ val surfaceContainerHighLightMediumContrast = Color(0xFFE8E7EF)
74
+ val surfaceContainerHighestLightMediumContrast = Color(0xFFE3E2E9)
75
+
76
+ val primaryLightHighContrast = Color(0xFF051F51)
77
+ val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
78
+ val primaryContainerLightHighContrast = Color(0xFF2C4174)
79
+ val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
80
+ val secondaryLightHighContrast = Color(0xFF0A1E52)
81
+ val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
82
+ val secondaryContainerLightHighContrast = Color(0xFF304074)
83
+ val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
84
+ val tertiaryLightHighContrast = Color(0xFF3A103C)
85
+ val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
86
+ val tertiaryContainerLightHighContrast = Color(0xFF5F325F)
87
+ val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
88
+ val errorLightHighContrast = Color(0xFF4E0002)
89
+ val onErrorLightHighContrast = Color(0xFFFFFFFF)
90
+ val errorContainerLightHighContrast = Color(0xFF8C0009)
91
+ val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
92
+ val backgroundLightHighContrast = Color(0xFFFAF8FF)
93
+ val onBackgroundLightHighContrast = Color(0xFF1A1B21)
94
+ val surfaceLightHighContrast = Color(0xFFFAF8FF)
95
+ val onSurfaceLightHighContrast = Color(0xFF000000)
96
+ val surfaceVariantLightHighContrast = Color(0xFFE1E2EC)
97
+ val onSurfaceVariantLightHighContrast = Color(0xFF22242B)
98
+ val outlineLightHighContrast = Color(0xFF41424B)
99
+ val outlineVariantLightHighContrast = Color(0xFF41424B)
100
+ val scrimLightHighContrast = Color(0xFF000000)
101
+ val inverseSurfaceLightHighContrast = Color(0xFF2F3036)
102
+ val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
103
+ val inversePrimaryLightHighContrast = Color(0xFFE7EBFF)
104
+ val surfaceDimLightHighContrast = Color(0xFFDAD9E0)
105
+ val surfaceBrightLightHighContrast = Color(0xFFFAF8FF)
106
+ val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
107
+ val surfaceContainerLowLightHighContrast = Color(0xFFF4F3FA)
108
+ val surfaceContainerLightHighContrast = Color(0xFFEEEDF4)
109
+ val surfaceContainerHighLightHighContrast = Color(0xFFE8E7EF)
110
+ val surfaceContainerHighestLightHighContrast = Color(0xFFE3E2E9)
111
+
112
+ val primaryDark = Color(0xFFB2C5FF)
113
+ val onPrimaryDark = Color(0xFF182E60)
114
+ val primaryContainerDark = Color(0xFF304578)
115
+ val onPrimaryContainerDark = Color(0xFFDAE2FF)
116
+ val secondaryDark = Color(0xFFB5C4FF)
117
+ val onSecondaryDark = Color(0xFF1C2D61)
118
+ val secondaryContainerDark = Color(0xFF344479)
119
+ val onSecondaryContainerDark = Color(0xFFDCE1FF)
120
+ val tertiaryDark = Color(0xFFEEB4EA)
121
+ val onTertiaryDark = Color(0xFF4A204C)
122
+ val tertiaryContainerDark = Color(0xFF633664)
123
+ val onTertiaryContainerDark = Color(0xFFFFD6FA)
124
+ val errorDark = Color(0xFFFFB4AB)
125
+ val onErrorDark = Color(0xFF690005)
126
+ val errorContainerDark = Color(0xFF93000A)
127
+ val onErrorContainerDark = Color(0xFFFFDAD6)
128
+ val backgroundDark = Color(0xFF121318)
129
+ val onBackgroundDark = Color(0xFFE3E2E9)
130
+ val surfaceDark = Color(0xFF121318)
131
+ val onSurfaceDark = Color(0xFFE3E2E9)
132
+ val surfaceVariantDark = Color(0xFF45464F)
133
+ val onSurfaceVariantDark = Color(0xFFC5C6D0)
134
+ val outlineDark = Color(0xFF8F909A)
135
+ val outlineVariantDark = Color(0xFF45464F)
136
+ val scrimDark = Color(0xFF000000)
137
+ val inverseSurfaceDark = Color(0xFFE3E2E9)
138
+ val inverseOnSurfaceDark = Color(0xFF2F3036)
139
+ val inversePrimaryDark = Color(0xFF495D92)
140
+ val surfaceDimDark = Color(0xFF121318)
141
+ val surfaceBrightDark = Color(0xFF38393F)
142
+ val surfaceContainerLowestDark = Color(0xFF0D0E13)
143
+ val surfaceContainerLowDark = Color(0xFF1A1B21)
144
+ val surfaceContainerDark = Color(0xFF1E1F25)
145
+ val surfaceContainerHighDark = Color(0xFF282A2F)
146
+ val surfaceContainerHighestDark = Color(0xFF33343A)
147
+
148
+ val primaryDarkMediumContrast = Color(0xFFB8CAFF)
149
+ val onPrimaryDarkMediumContrast = Color(0xFF00133D)
150
+ val primaryContainerDarkMediumContrast = Color(0xFF7B8FC8)
151
+ val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
152
+ val secondaryDarkMediumContrast = Color(0xFFBBC9FF)
153
+ val onSecondaryDarkMediumContrast = Color(0xFF001242)
154
+ val secondaryContainerDarkMediumContrast = Color(0xFF7E8EC8)
155
+ val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
156
+ val tertiaryDarkMediumContrast = Color(0xFFF2B8EE)
157
+ val onTertiaryDarkMediumContrast = Color(0xFF2C0330)
158
+ val tertiaryContainerDarkMediumContrast = Color(0xFFB47FB2)
159
+ val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
160
+ val errorDarkMediumContrast = Color(0xFFFFBAB1)
161
+ val onErrorDarkMediumContrast = Color(0xFF370001)
162
+ val errorContainerDarkMediumContrast = Color(0xFFFF5449)
163
+ val onErrorContainerDarkMediumContrast = Color(0xFF000000)
164
+ val backgroundDarkMediumContrast = Color(0xFF121318)
165
+ val onBackgroundDarkMediumContrast = Color(0xFFE3E2E9)
166
+ val surfaceDarkMediumContrast = Color(0xFF121318)
167
+ val onSurfaceDarkMediumContrast = Color(0xFFFCFAFF)
168
+ val surfaceVariantDarkMediumContrast = Color(0xFF45464F)
169
+ val onSurfaceVariantDarkMediumContrast = Color(0xFFC9CAD4)
170
+ val outlineDarkMediumContrast = Color(0xFFA1A2AC)
171
+ val outlineVariantDarkMediumContrast = Color(0xFF81838C)
172
+ val scrimDarkMediumContrast = Color(0xFF000000)
173
+ val inverseSurfaceDarkMediumContrast = Color(0xFFE3E2E9)
174
+ val inverseOnSurfaceDarkMediumContrast = Color(0xFF292A2F)
175
+ val inversePrimaryDarkMediumContrast = Color(0xFF32467A)
176
+ val surfaceDimDarkMediumContrast = Color(0xFF121318)
177
+ val surfaceBrightDarkMediumContrast = Color(0xFF38393F)
178
+ val surfaceContainerLowestDarkMediumContrast = Color(0xFF0D0E13)
179
+ val surfaceContainerLowDarkMediumContrast = Color(0xFF1A1B21)
180
+ val surfaceContainerDarkMediumContrast = Color(0xFF1E1F25)
181
+ val surfaceContainerHighDarkMediumContrast = Color(0xFF282A2F)
182
+ val surfaceContainerHighestDarkMediumContrast = Color(0xFF33343A)
183
+
184
+ val primaryDarkHighContrast = Color(0xFFFCFAFF)
185
+ val onPrimaryDarkHighContrast = Color(0xFF000000)
186
+ val primaryContainerDarkHighContrast = Color(0xFFB8CAFF)
187
+ val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
188
+ val secondaryDarkHighContrast = Color(0xFFFCFAFF)
189
+ val onSecondaryDarkHighContrast = Color(0xFF000000)
190
+ val secondaryContainerDarkHighContrast = Color(0xFFBBC9FF)
191
+ val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
192
+ val tertiaryDarkHighContrast = Color(0xFFFFF9FA)
193
+ val onTertiaryDarkHighContrast = Color(0xFF000000)
194
+ val tertiaryContainerDarkHighContrast = Color(0xFFF2B8EE)
195
+ val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
196
+ val errorDarkHighContrast = Color(0xFFFFF9F9)
197
+ val onErrorDarkHighContrast = Color(0xFF000000)
198
+ val errorContainerDarkHighContrast = Color(0xFFFFBAB1)
199
+ val onErrorContainerDarkHighContrast = Color(0xFF000000)
200
+ val backgroundDarkHighContrast = Color(0xFF121318)
201
+ val onBackgroundDarkHighContrast = Color(0xFFE3E2E9)
202
+ val surfaceDarkHighContrast = Color(0xFF121318)
203
+ val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
204
+ val surfaceVariantDarkHighContrast = Color(0xFF45464F)
205
+ val onSurfaceVariantDarkHighContrast = Color(0xFFFCFAFF)
206
+ val outlineDarkHighContrast = Color(0xFFC9CAD4)
207
+ val outlineVariantDarkHighContrast = Color(0xFFC9CAD4)
208
+ val scrimDarkHighContrast = Color(0xFF000000)
209
+ val inverseSurfaceDarkHighContrast = Color(0xFFE3E2E9)
210
+ val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
211
+ val inversePrimaryDarkHighContrast = Color(0xFF10275A)
212
+ val surfaceDimDarkHighContrast = Color(0xFF121318)
213
+ val surfaceBrightDarkHighContrast = Color(0xFF38393F)
214
+ val surfaceContainerLowestDarkHighContrast = Color(0xFF0D0E13)
215
+ val surfaceContainerLowDarkHighContrast = Color(0xFF1A1B21)
216
+ val surfaceContainerDarkHighContrast = Color(0xFF1E1F25)
217
+ val surfaceContainerHighDarkHighContrast = Color(0xFF282A2F)
218
+ val surfaceContainerHighestDarkHighContrast = Color(0xFF33343A)
219
+
220
+
221
+
222
+
223
+
224
+
225
+
app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Theme.kt ADDED
@@ -0,0 +1,246 @@
1
+ package dev.pyrossh.onlyBible.ui.theme
2
+
3
+ import androidx.compose.material3.darkColorScheme
4
+ import androidx.compose.material3.lightColorScheme
5
+ import androidx.compose.runtime.Immutable
6
+ import androidx.compose.ui.graphics.Color
7
+
8
+ val lightScheme = lightColorScheme(
9
+ primary = primaryLight,
10
+ onPrimary = onPrimaryLight,
11
+ primaryContainer = primaryContainerLight,
12
+ onPrimaryContainer = onPrimaryContainerLight,
13
+ secondary = secondaryLight,
14
+ onSecondary = onSecondaryLight,
15
+ secondaryContainer = secondaryContainerLight,
16
+ onSecondaryContainer = onSecondaryContainerLight,
17
+ tertiary = tertiaryLight,
18
+ onTertiary = onTertiaryLight,
19
+ tertiaryContainer = tertiaryContainerLight,
20
+ onTertiaryContainer = onTertiaryContainerLight,
21
+ error = errorLight,
22
+ onError = onErrorLight,
23
+ errorContainer = errorContainerLight,
24
+ onErrorContainer = onErrorContainerLight,
25
+ background = backgroundLight,
26
+ onBackground = onBackgroundLight,
27
+ surface = surfaceLight,
28
+ onSurface = onSurfaceLight,
29
+ surfaceVariant = surfaceVariantLight,
30
+ onSurfaceVariant = onSurfaceVariantLight,
31
+ outline = outlineLight,
32
+ outlineVariant = outlineVariantLight,
33
+ scrim = scrimLight,
34
+ inverseSurface = inverseSurfaceLight,
35
+ inverseOnSurface = inverseOnSurfaceLight,
36
+ inversePrimary = inversePrimaryLight,
37
+ surfaceDim = surfaceDimLight,
38
+ surfaceBright = surfaceBrightLight,
39
+ surfaceContainerLowest = surfaceContainerLowestLight,
40
+ surfaceContainerLow = surfaceContainerLowLight,
41
+ surfaceContainer = surfaceContainerLight,
42
+ surfaceContainerHigh = surfaceContainerHighLight,
43
+ surfaceContainerHighest = surfaceContainerHighestLight,
44
+ )
45
+
46
+ val darkScheme = darkColorScheme(
47
+ primary = primaryDark,
48
+ onPrimary = onPrimaryDark,
49
+ primaryContainer = primaryContainerDark,
50
+ onPrimaryContainer = onPrimaryContainerDark,
51
+ secondary = secondaryDark,
52
+ onSecondary = onSecondaryDark,
53
+ secondaryContainer = secondaryContainerDark,
54
+ onSecondaryContainer = onSecondaryContainerDark,
55
+ tertiary = tertiaryDark,
56
+ onTertiary = onTertiaryDark,
57
+ tertiaryContainer = tertiaryContainerDark,
58
+ onTertiaryContainer = onTertiaryContainerDark,
59
+ error = errorDark,
60
+ onError = onErrorDark,
61
+ errorContainer = errorContainerDark,
62
+ onErrorContainer = onErrorContainerDark,
63
+ background = backgroundDark,
64
+ onBackground = onBackgroundDark,
65
+ surface = surfaceDark,
66
+ onSurface = onSurfaceDark,
67
+ surfaceVariant = surfaceVariantDark,
68
+ onSurfaceVariant = onSurfaceVariantDark,
69
+ outline = outlineDark,
70
+ outlineVariant = outlineVariantDark,
71
+ scrim = scrimDark,
72
+ inverseSurface = inverseSurfaceDark,
73
+ inverseOnSurface = inverseOnSurfaceDark,
74
+ inversePrimary = inversePrimaryDark,
75
+ surfaceDim = surfaceDimDark,
76
+ surfaceBright = surfaceBrightDark,
77
+ surfaceContainerLowest = surfaceContainerLowestDark,
78
+ surfaceContainerLow = surfaceContainerLowDark,
79
+ surfaceContainer = surfaceContainerDark,
80
+ surfaceContainerHigh = surfaceContainerHighDark,
81
+ surfaceContainerHighest = surfaceContainerHighestDark,
82
+ )
83
+
84
+ private val mediumContrastLightColorScheme = lightColorScheme(
85
+ primary = primaryLightMediumContrast,
86
+ onPrimary = onPrimaryLightMediumContrast,
87
+ primaryContainer = primaryContainerLightMediumContrast,
88
+ onPrimaryContainer = onPrimaryContainerLightMediumContrast,
89
+ secondary = secondaryLightMediumContrast,
90
+ onSecondary = onSecondaryLightMediumContrast,
91
+ secondaryContainer = secondaryContainerLightMediumContrast,
92
+ onSecondaryContainer = onSecondaryContainerLightMediumContrast,
93
+ tertiary = tertiaryLightMediumContrast,
94
+ onTertiary = onTertiaryLightMediumContrast,
95
+ tertiaryContainer = tertiaryContainerLightMediumContrast,
96
+ onTertiaryContainer = onTertiaryContainerLightMediumContrast,
97
+ error = errorLightMediumContrast,
98
+ onError = onErrorLightMediumContrast,
99
+ errorContainer = errorContainerLightMediumContrast,
100
+ onErrorContainer = onErrorContainerLightMediumContrast,
101
+ background = backgroundLightMediumContrast,
102
+ onBackground = onBackgroundLightMediumContrast,
103
+ surface = surfaceLightMediumContrast,
104
+ onSurface = onSurfaceLightMediumContrast,
105
+ surfaceVariant = surfaceVariantLightMediumContrast,
106
+ onSurfaceVariant = onSurfaceVariantLightMediumContrast,
107
+ outline = outlineLightMediumContrast,
108
+ outlineVariant = outlineVariantLightMediumContrast,
109
+ scrim = scrimLightMediumContrast,
110
+ inverseSurface = inverseSurfaceLightMediumContrast,
111
+ inverseOnSurface = inverseOnSurfaceLightMediumContrast,
112
+ inversePrimary = inversePrimaryLightMediumContrast,
113
+ surfaceDim = surfaceDimLightMediumContrast,
114
+ surfaceBright = surfaceBrightLightMediumContrast,
115
+ surfaceContainerLowest = surfaceContainerLowestLightMediumContrast,
116
+ surfaceContainerLow = surfaceContainerLowLightMediumContrast,
117
+ surfaceContainer = surfaceContainerLightMediumContrast,
118
+ surfaceContainerHigh = surfaceContainerHighLightMediumContrast,
119
+ surfaceContainerHighest = surfaceContainerHighestLightMediumContrast,
120
+ )
121
+
122
+ private val highContrastLightColorScheme = lightColorScheme(
123
+ primary = primaryLightHighContrast,
124
+ onPrimary = onPrimaryLightHighContrast,
125
+ primaryContainer = primaryContainerLightHighContrast,
126
+ onPrimaryContainer = onPrimaryContainerLightHighContrast,
127
+ secondary = secondaryLightHighContrast,
128
+ onSecondary = onSecondaryLightHighContrast,
129
+ secondaryContainer = secondaryContainerLightHighContrast,
130
+ onSecondaryContainer = onSecondaryContainerLightHighContrast,
131
+ tertiary = tertiaryLightHighContrast,
132
+ onTertiary = onTertiaryLightHighContrast,
133
+ tertiaryContainer = tertiaryContainerLightHighContrast,
134
+ onTertiaryContainer = onTertiaryContainerLightHighContrast,
135
+ error = errorLightHighContrast,
136
+ onError = onErrorLightHighContrast,
137
+ errorContainer = errorContainerLightHighContrast,
138
+ onErrorContainer = onErrorContainerLightHighContrast,
139
+ background = backgroundLightHighContrast,
140
+ onBackground = onBackgroundLightHighContrast,
141
+ surface = surfaceLightHighContrast,
142
+ onSurface = onSurfaceLightHighContrast,
143
+ surfaceVariant = surfaceVariantLightHighContrast,
144
+ onSurfaceVariant = onSurfaceVariantLightHighContrast,
145
+ outline = outlineLightHighContrast,
146
+ outlineVariant = outlineVariantLightHighContrast,
147
+ scrim = scrimLightHighContrast,
148
+ inverseSurface = inverseSurfaceLightHighContrast,
149
+ inverseOnSurface = inverseOnSurfaceLightHighContrast,
150
+ inversePrimary = inversePrimaryLightHighContrast,
151
+ surfaceDim = surfaceDimLightHighContrast,
152
+ surfaceBright = surfaceBrightLightHighContrast,
153
+ surfaceContainerLowest = surfaceContainerLowestLightHighContrast,
154
+ surfaceContainerLow = surfaceContainerLowLightHighContrast,
155
+ surfaceContainer = surfaceContainerLightHighContrast,
156
+ surfaceContainerHigh = surfaceContainerHighLightHighContrast,
157
+ surfaceContainerHighest = surfaceContainerHighestLightHighContrast,
158
+ )
159
+
160
+ private val mediumContrastDarkColorScheme = darkColorScheme(
161
+ primary = primaryDarkMediumContrast,
162
+ onPrimary = onPrimaryDarkMediumContrast,
163
+ primaryContainer = primaryContainerDarkMediumContrast,
164
+ onPrimaryContainer = onPrimaryContainerDarkMediumContrast,
165
+ secondary = secondaryDarkMediumContrast,
166
+ onSecondary = onSecondaryDarkMediumContrast,
167
+ secondaryContainer = secondaryContainerDarkMediumContrast,
168
+ onSecondaryContainer = onSecondaryContainerDarkMediumContrast,
169
+ tertiary = tertiaryDarkMediumContrast,
170
+ onTertiary = onTertiaryDarkMediumContrast,
171
+ tertiaryContainer = tertiaryContainerDarkMediumContrast,
172
+ onTertiaryContainer = onTertiaryContainerDarkMediumContrast,
173
+ error = errorDarkMediumContrast,
174
+ onError = onErrorDarkMediumContrast,
175
+ errorContainer = errorContainerDarkMediumContrast,
176
+ onErrorContainer = onErrorContainerDarkMediumContrast,
177
+ background = backgroundDarkMediumContrast,
178
+ onBackground = onBackgroundDarkMediumContrast,
179
+ surface = surfaceDarkMediumContrast,
180
+ onSurface = onSurfaceDarkMediumContrast,
181
+ surfaceVariant = surfaceVariantDarkMediumContrast,
182
+ onSurfaceVariant = onSurfaceVariantDarkMediumContrast,
183
+ outline = outlineDarkMediumContrast,
184
+ outlineVariant = outlineVariantDarkMediumContrast,
185
+ scrim = scrimDarkMediumContrast,
186
+ inverseSurface = inverseSurfaceDarkMediumContrast,
187
+ inverseOnSurface = inverseOnSurfaceDarkMediumContrast,
188
+ inversePrimary = inversePrimaryDarkMediumContrast,
189
+ surfaceDim = surfaceDimDarkMediumContrast,
190
+ surfaceBright = surfaceBrightDarkMediumContrast,
191
+ surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast,
192
+ surfaceContainerLow = surfaceContainerLowDarkMediumContrast,
193
+ surfaceContainer = surfaceContainerDarkMediumContrast,
194
+ surfaceContainerHigh = surfaceContainerHighDarkMediumContrast,
195
+ surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast,
196
+ )
197
+
198
+ private val highContrastDarkColorScheme = darkColorScheme(
199
+ primary = primaryDarkHighContrast,
200
+ onPrimary = onPrimaryDarkHighContrast,
201
+ primaryContainer = primaryContainerDarkHighContrast,
202
+ onPrimaryContainer = onPrimaryContainerDarkHighContrast,
203
+ secondary = secondaryDarkHighContrast,
204
+ onSecondary = onSecondaryDarkHighContrast,
205
+ secondaryContainer = secondaryContainerDarkHighContrast,
206
+ onSecondaryContainer = onSecondaryContainerDarkHighContrast,
207
+ tertiary = tertiaryDarkHighContrast,
208
+ onTertiary = onTertiaryDarkHighContrast,
209
+ tertiaryContainer = tertiaryContainerDarkHighContrast,
210
+ onTertiaryContainer = onTertiaryContainerDarkHighContrast,
211
+ error = errorDarkHighContrast,
212
+ onError = onErrorDarkHighContrast,
213
+ errorContainer = errorContainerDarkHighContrast,
214
+ onErrorContainer = onErrorContainerDarkHighContrast,
215
+ background = backgroundDarkHighContrast,
216
+ onBackground = onBackgroundDarkHighContrast,
217
+ surface = surfaceDarkHighContrast,
218
+ onSurface = onSurfaceDarkHighContrast,
219
+ surfaceVariant = surfaceVariantDarkHighContrast,
220
+ onSurfaceVariant = onSurfaceVariantDarkHighContrast,
221
+ outline = outlineDarkHighContrast,
222
+ outlineVariant = outlineVariantDarkHighContrast,
223
+ scrim = scrimDarkHighContrast,
224
+ inverseSurface = inverseSurfaceDarkHighContrast,
225
+ inverseOnSurface = inverseOnSurfaceDarkHighContrast,
226
+ inversePrimary = inversePrimaryDarkHighContrast,
227
+ surfaceDim = surfaceDimDarkHighContrast,
228
+ surfaceBright = surfaceBrightDarkHighContrast,
229
+ surfaceContainerLowest = surfaceContainerLowestDarkHighContrast,
230
+ surfaceContainerLow = surfaceContainerLowDarkHighContrast,
231
+ surfaceContainer = surfaceContainerDarkHighContrast,
232
+ surfaceContainerHigh = surfaceContainerHighDarkHighContrast,
233
+ surfaceContainerHighest = surfaceContainerHighestDarkHighContrast,
234
+ )
235
+
236
+ @Immutable
237
+ data class ColorFamily(
238
+ val color: Color,
239
+ val onColor: Color,
240
+ val colorContainer: Color,
241
+ val onColorContainer: Color
242
+ )
243
+
244
+ val unspecified_scheme = ColorFamily(
245
+ Color.Unspecified, Color.Unspecified, Color.Unspecified, Color.Unspecified
246
+ )
app/src/main/java/dev/pyrossh/onlyBible/ui/theme/Type.kt ADDED
@@ -0,0 +1,8 @@
1
+ package dev.pyrossh.onlyBible.ui.theme
2
+
3
+ import androidx.compose.material3.Typography
4
+ // Default Material 3 typography values
5
+ val baseline = Typography()
6
+
7
+ val AppTypography = Typography()
8
+
build.gradle.kts CHANGED
@@ -5,7 +5,6 @@ plugins {
5
5
  alias(libs.plugins.jetbrains.kotlin.android) apply false
6
6
  alias(libs.plugins.secrets.gradle.plugin) apply false
7
7
  alias(libs.plugins.kotlinx.serializer) apply false
8
- alias(libs.plugins.kotlin.parcelize) apply false
9
8
  }
10
9
 
11
10
  buildscript {
gradle/libs.versions.toml CHANGED
@@ -35,5 +35,4 @@ android-application = { id = "com.android.application", version.ref = "agp" }
35
35
  compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
36
36
  jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
37
37
  kotlinx-serializer = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}
38
- kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
39
38
  secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }