Skip to content

Commit 85cc6b9

Browse files
CrustackCrustack
authored
Merge pull request #817 from Crustack/feat/705
Add normal dark mode next to super dark mode
2 parents 20d0aa7 + 19f2fdd commit 85cc6b9

File tree

11 files changed

+105
-89
lines changed

11 files changed

+105
-89
lines changed

‎TRANSLATIONS.md‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,34 @@ See [Android Translations Converter](https://github.com/Crustack/android-transla
1919
<!-- translations:start -->
2020
| Language | Coverage |
2121
|----------|----------|
22-
| 🇺🇸 English | 100% (328/328) |
23-
| 🇪🇸 Catalan | 19% (65/328) |
24-
| 🇨🇿 Czech | 95% (313/328) |
25-
| 🇩🇰 Danish | 21% (69/328) |
26-
| 🇩🇪 German | 95% (313/328) |
27-
| 🇬🇷 Greek | 21% (72/328) |
28-
| 🇪🇸 Spanish | 95% (314/328) |
29-
| 🇫🇷 French | 98% (324/328) |
30-
| 🇭🇺 Hungarian | 19% (65/328) |
31-
| 🇮🇩 Indonesian | 22% (75/328) |
32-
| 🇮🇹 Italian | 88% (291/328) |
33-
| 🇯🇵 Japanese | 22% (73/328) |
34-
| 🇲🇲 Burmese | 27% (90/328) |
35-
| 🇳🇴 Norwegian Bokmål | 32% (106/328) |
36-
| 🇳🇱 Dutch | 64% (212/328) |
37-
| 🇳🇴 Norwegian Nynorsk | 32% (106/328) |
38-
| 🇵🇱 Polish | 91% (300/328) |
39-
| 🇧🇷 Portuguese (Brazil) | 95% (312/328) |
40-
| 🇵🇹 Portuguese (Portugal) | 21% (71/328) |
41-
| 🇷🇴 Romanian | 91% (301/328) |
42-
| 🇷🇺 Russian | 92% (305/328) |
43-
| 🇸🇰 Slovak | 19% (65/328) |
44-
| 🇸🇮 Slovenian | 33% (109/328) |
45-
| 🇸🇪 Swedish | 19% (63/328) |
46-
| 🇵🇭 Tagalog | 19% (65/328) |
47-
| 🇹🇷 Turkish | 22% (73/328) |
48-
| 🇺🇦 Ukrainian | 95% (314/328) |
49-
| 🇻🇳 Vietnamese | 32% (107/328) |
50-
| 🇨🇳 Chinese (Simplified) | 95% (313/328) |
51-
| 🇹🇼 Chinese (Traditional) | 89% (294/328) |
22+
| 🇺🇸 English | 100% (329/329) |
23+
| 🇪🇸 Catalan | 19% (65/329) |
24+
| 🇨🇿 Czech | 95% (313/329) |
25+
| 🇩🇰 Danish | 20% (69/329) |
26+
| 🇩🇪 German | 95% (313/329) |
27+
| 🇬🇷 Greek | 21% (72/329) |
28+
| 🇪🇸 Spanish | 95% (314/329) |
29+
| 🇫🇷 French | 98% (324/329) |
30+
| 🇭🇺 Hungarian | 19% (65/329) |
31+
| 🇮🇩 Indonesian | 22% (75/329) |
32+
| 🇮🇹 Italian | 88% (291/329) |
33+
| 🇯🇵 Japanese | 22% (73/329) |
34+
| 🇲🇲 Burmese | 27% (90/329) |
35+
| 🇳🇴 Norwegian Bokmål | 32% (106/329) |
36+
| 🇳🇱 Dutch | 64% (212/329) |
37+
| 🇳🇴 Norwegian Nynorsk | 32% (106/329) |
38+
| 🇵🇱 Polish | 91% (300/329) |
39+
| 🇧🇷 Portuguese (Brazil) | 94% (312/329) |
40+
| 🇵🇹 Portuguese (Portugal) | 21% (71/329) |
41+
| 🇷🇴 Romanian | 91% (301/329) |
42+
| 🇷🇺 Russian | 92% (305/329) |
43+
| 🇸🇰 Slovak | 19% (65/329) |
44+
| 🇸🇮 Slovenian | 33% (109/329) |
45+
| 🇸🇪 Swedish | 19% (63/329) |
46+
| 🇵🇭 Tagalog | 19% (65/329) |
47+
| 🇹🇷 Turkish | 22% (73/329) |
48+
| 🇺🇦 Ukrainian | 95% (314/329) |
49+
| 🇻🇳 Vietnamese | 32% (107/329) |
50+
| 🇨🇳 Chinese (Simplified) | 95% (313/329) |
51+
| 🇹🇼 Chinese (Traditional) | 89% (294/329) |
5252
<!-- translations:end -->

‎app/src/main/java/com/philkes/notallyx/NotallyXApplication.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class NotallyXApplication : Application(), Application.ActivityLifecycleCallback
6161
}
6262
preferences.theme.observeForeverWithPrevious { (oldTheme, theme) ->
6363
when (theme) {
64-
Theme.DARK ->
64+
Theme.DARK,
65+
Theme.SUPER_DARK ->
6566
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
6667

6768
Theme.LIGHT ->

‎app/src/main/java/com/philkes/notallyx/presentation/activity/LockedActivity.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.philkes.notallyx.R
2323
import com.philkes.notallyx.presentation.showToast
2424
import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
2525
import com.philkes.notallyx.presentation.viewmodel.preference.NotallyXPreferences
26+
import com.philkes.notallyx.presentation.viewmodel.preference.Theme
2627
import com.philkes.notallyx.utils.security.showBiometricOrPinPrompt
2728
import kotlinx.coroutines.launch
2829

@@ -40,7 +41,10 @@ abstract class LockedActivity<T : ViewBinding> : AppCompatActivity() {
4041
super.onCreate(savedInstanceState)
4142
notallyXApplication = (application as NotallyXApplication)
4243
preferences = NotallyXPreferences.getInstance(application)
43-
44+
when (preferences.theme.value) {
45+
Theme.SUPER_DARK -> theme.applyStyle(R.style.AppTheme_SuperDark, true)
46+
else -> theme.applyStyle(R.style.AppTheme, true)
47+
}
4448
biometricAuthenticationActivityResultLauncher =
4549
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
4650
if (result.resultCode == Activity.RESULT_OK) {

‎app/src/main/java/com/philkes/notallyx/presentation/viewmodel/preference/Preference.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,9 @@ enum class NotesView(override val textResId: Int) : StaticTextProvider {
294294
}
295295

296296
enum class Theme(override val textResId: Int) : StaticTextProvider {
297-
DARK(R.string.dark),
298297
LIGHT(R.string.light),
298+
DARK(R.string.dark),
299+
SUPER_DARK(R.string.super_dark),
299300
FOLLOW_SYSTEM(R.string.follow_system),
300301
}
301302

‎app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetFactory.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.philkes.notallyx.NotallyXApplication
1111
import com.philkes.notallyx.R
1212
import com.philkes.notallyx.data.NotallyDatabase
1313
import com.philkes.notallyx.data.model.BaseNote
14-
import com.philkes.notallyx.data.model.BaseNote.Companion.COLOR_DEFAULT
1514
import com.philkes.notallyx.data.model.ListItem
1615
import com.philkes.notallyx.data.model.Type
1716
import com.philkes.notallyx.presentation.viewmodel.preference.NotallyXPreferences
@@ -83,11 +82,9 @@ class WidgetFactory(
8382
setOnClickFillInIntent(R.id.ChangeNote, getWidgetSelectNoteIntent(widgetId))
8483
setOnClickFillInIntent(R.id.LinearLayout, getWidgetOpenNoteIntent(note.type, note.id))
8584

86-
if (note.color != COLOR_DEFAULT) {
87-
val (_, controlsColor) = app.extractWidgetColors(note.color, preferences)
88-
setTextViewsTextColor(listOf(R.id.Title, R.id.Note), controlsColor)
89-
setImageViewColor(R.id.ChangeNote, controlsColor)
90-
}
85+
val (_, controlsColor) = app.extractWidgetColors(note.color, preferences)
86+
setTextViewsTextColor(listOf(R.id.Title, R.id.Note), controlsColor)
87+
setImageViewColor(R.id.ChangeNote, controlsColor)
9188
}
9289
}
9390

‎app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetProvider.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,9 @@ class WidgetProvider : AppWidgetProvider() {
260260
)
261261
}
262262
val preferences = NotallyXPreferences.getInstance(context)
263-
if (color != BaseNote.COLOR_DEFAULT) {
264-
val (backgroundColor, _) =
265-
context.extractWidgetColors(color, preferences)
266-
setInt(R.id.Layout, "setBackgroundColor", backgroundColor)
267-
}
263+
val (backgroundColor, _) =
264+
context.extractWidgetColors(color, preferences)
265+
setInt(R.id.Layout, "setBackgroundColor", backgroundColor)
268266
}
269267
manager.updateAppWidget(id, view)
270268
manager.notifyAppWidgetViewDataChanged(id, R.id.ListView)
@@ -329,11 +327,12 @@ class WidgetProvider : AppWidgetProvider() {
329327
if (color == BaseNote.COLOR_DEFAULT) {
330328
val id =
331329
when (preferences.theme.value) {
332-
Theme.DARK -> R.color.md_theme_surface_dark
333-
Theme.LIGHT -> R.color.md_theme_surface
330+
Theme.DARK -> R.color.ContainerDark
331+
Theme.SUPER_DARK -> R.color.ContainerSuperDark
332+
Theme.LIGHT -> R.color.ContainerLight
334333
Theme.FOLLOW_SYSTEM -> {
335-
if (isSystemInDarkMode()) R.color.md_theme_surface_dark
336-
else R.color.md_theme_surface
334+
if (isSystemInDarkMode()) R.color.ContainerDark
335+
else R.color.ContainerLight
337336
}
338337
}
339338
ContextCompat.getColor(this, id)

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<color name="md_theme_onSurfaceVariant">#C6C5D0</color>
2424
<color name="md_theme_outline">#90909A</color>
2525
<color name="md_theme_outlineVariant">#45464F</color>
26-
<color name="md_theme_scrim">#000000</color>
26+
<color name="md_theme_scrim">@color/ContainerSuperDark</color>
2727
<color name="md_theme_inverseSurface">#E3E1E9</color>
2828
<color name="md_theme_inverseOnSurface">#2F3036</color>
2929
<color name="md_theme_inversePrimary">#4E5C92</color>
@@ -42,26 +42,26 @@
4242
<color name="md_theme_surfaceDim">#121318</color>
4343
<color name="md_theme_surfaceBright">#38393F</color>
4444
<color name="md_theme_surfaceContainerLowest">#0D0E13</color>
45-
<color name="md_theme_surfaceContainerLow">#1A1B21</color>
45+
<color name="md_theme_surfaceContainerLow">@color/ContainerDark</color>
4646
<color name="md_theme_surfaceContainer">#1E1F25</color>
4747
<color name="md_theme_surfaceContainerHigh">#292A2F</color>
4848
<color name="md_theme_surfaceContainerHighest">#34343A</color>
4949
<color name="md_theme_primary_mediumContrast">#BCC8FF</color>
5050
<color name="md_theme_onPrimary_mediumContrast">#001045</color>
5151
<color name="md_theme_primaryContainer_mediumContrast">#808EC8</color>
52-
<color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
52+
<color name="md_theme_onPrimaryContainer_mediumContrast">@color/ContainerSuperDark</color>
5353
<color name="md_theme_secondary_mediumContrast">#C6C9E1</color>
5454
<color name="md_theme_onSecondary_mediumContrast">#111526</color>
5555
<color name="md_theme_secondaryContainer_mediumContrast">#8C90A6</color>
56-
<color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
56+
<color name="md_theme_onSecondaryContainer_mediumContrast">@color/ContainerSuperDark</color>
5757
<color name="md_theme_tertiary_mediumContrast">#E8BEDE</color>
5858
<color name="md_theme_onTertiary_mediumContrast">#260D24</color>
5959
<color name="md_theme_tertiaryContainer_mediumContrast">#AB85A3</color>
60-
<color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
60+
<color name="md_theme_onTertiaryContainer_mediumContrast">@color/ContainerSuperDark</color>
6161
<color name="md_theme_error_mediumContrast">#FFBAB1</color>
6262
<color name="md_theme_onError_mediumContrast">#370001</color>
6363
<color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
64-
<color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
64+
<color name="md_theme_onErrorContainer_mediumContrast">@color/ContainerSuperDark</color>
6565
<color name="md_theme_background_mediumContrast">#121318</color>
6666
<color name="md_theme_onBackground_mediumContrast">#E3E1E9</color>
6767
<color name="md_theme_surface_mediumContrast">#121318</color>
@@ -70,7 +70,7 @@
7070
<color name="md_theme_onSurfaceVariant_mediumContrast">#CACAD4</color>
7171
<color name="md_theme_outline_mediumContrast">#A2A2AC</color>
7272
<color name="md_theme_outlineVariant_mediumContrast">#82828C</color>
73-
<color name="md_theme_scrim_mediumContrast">#000000</color>
73+
<color name="md_theme_scrim_mediumContrast">@color/ContainerSuperDark</color>
7474
<color name="md_theme_inverseSurface_mediumContrast">#E3E1E9</color>
7575
<color name="md_theme_inverseOnSurface_mediumContrast">#292A2F</color>
7676
<color name="md_theme_inversePrimary_mediumContrast">#37457A</color>
@@ -89,26 +89,26 @@
8989
<color name="md_theme_surfaceDim_mediumContrast">#121318</color>
9090
<color name="md_theme_surfaceBright_mediumContrast">#38393F</color>
9191
<color name="md_theme_surfaceContainerLowest_mediumContrast">#0D0E13</color>
92-
<color name="md_theme_surfaceContainerLow_mediumContrast">#1A1B21</color>
92+
<color name="md_theme_surfaceContainerLow_mediumContrast">@color/ContainerDark</color>
9393
<color name="md_theme_surfaceContainer_mediumContrast">#1E1F25</color>
9494
<color name="md_theme_surfaceContainerHigh_mediumContrast">#292A2F</color>
9595
<color name="md_theme_surfaceContainerHighest_mediumContrast">#34343A</color>
9696
<color name="md_theme_primary_highContrast">#FCFAFF</color>
97-
<color name="md_theme_onPrimary_highContrast">#000000</color>
97+
<color name="md_theme_onPrimary_highContrast">@color/ContainerSuperDark</color>
9898
<color name="md_theme_primaryContainer_highContrast">#BCC8FF</color>
99-
<color name="md_theme_onPrimaryContainer_highContrast">#000000</color>
99+
<color name="md_theme_onPrimaryContainer_highContrast">@color/ContainerSuperDark</color>
100100
<color name="md_theme_secondary_highContrast">#FCFAFF</color>
101-
<color name="md_theme_onSecondary_highContrast">#000000</color>
101+
<color name="md_theme_onSecondary_highContrast">@color/ContainerSuperDark</color>
102102
<color name="md_theme_secondaryContainer_highContrast">#C6C9E1</color>
103-
<color name="md_theme_onSecondaryContainer_highContrast">#000000</color>
103+
<color name="md_theme_onSecondaryContainer_highContrast">@color/ContainerSuperDark</color>
104104
<color name="md_theme_tertiary_highContrast">#FFF9FA</color>
105-
<color name="md_theme_onTertiary_highContrast">#000000</color>
105+
<color name="md_theme_onTertiary_highContrast">@color/ContainerSuperDark</color>
106106
<color name="md_theme_tertiaryContainer_highContrast">#E8BEDE</color>
107-
<color name="md_theme_onTertiaryContainer_highContrast">#000000</color>
107+
<color name="md_theme_onTertiaryContainer_highContrast">@color/ContainerSuperDark</color>
108108
<color name="md_theme_error_highContrast">#FFF9F9</color>
109-
<color name="md_theme_onError_highContrast">#000000</color>
109+
<color name="md_theme_onError_highContrast">@color/ContainerSuperDark</color>
110110
<color name="md_theme_errorContainer_highContrast">#FFBAB1</color>
111-
<color name="md_theme_onErrorContainer_highContrast">#000000</color>
111+
<color name="md_theme_onErrorContainer_highContrast">@color/ContainerSuperDark</color>
112112
<color name="md_theme_background_highContrast">#121318</color>
113113
<color name="md_theme_onBackground_highContrast">#E3E1E9</color>
114114
<color name="md_theme_surface_highContrast">#121318</color>
@@ -117,26 +117,26 @@
117117
<color name="md_theme_onSurfaceVariant_highContrast">#FCFAFF</color>
118118
<color name="md_theme_outline_highContrast">#CACAD4</color>
119119
<color name="md_theme_outlineVariant_highContrast">#CACAD4</color>
120-
<color name="md_theme_scrim_highContrast">#000000</color>
120+
<color name="md_theme_scrim_highContrast">@color/ContainerSuperDark</color>
121121
<color name="md_theme_inverseSurface_highContrast">#E3E1E9</color>
122-
<color name="md_theme_inverseOnSurface_highContrast">#000000</color>
122+
<color name="md_theme_inverseOnSurface_highContrast">@color/ContainerSuperDark</color>
123123
<color name="md_theme_inversePrimary_highContrast">#17265A</color>
124124
<color name="md_theme_primaryFixed_highContrast">#E2E5FF</color>
125-
<color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
125+
<color name="md_theme_onPrimaryFixed_highContrast">@color/ContainerSuperDark</color>
126126
<color name="md_theme_primaryFixedDim_highContrast">#BCC8FF</color>
127127
<color name="md_theme_onPrimaryFixedVariant_highContrast">#001045</color>
128128
<color name="md_theme_secondaryFixed_highContrast">#E2E5FE</color>
129-
<color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
129+
<color name="md_theme_onSecondaryFixed_highContrast">@color/ContainerSuperDark</color>
130130
<color name="md_theme_secondaryFixedDim_highContrast">#C6C9E1</color>
131131
<color name="md_theme_onSecondaryFixedVariant_highContrast">#111526</color>
132132
<color name="md_theme_tertiaryFixed_highContrast">#FFDDF5</color>
133-
<color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
133+
<color name="md_theme_onTertiaryFixed_highContrast">@color/ContainerSuperDark</color>
134134
<color name="md_theme_tertiaryFixedDim_highContrast">#E8BEDE</color>
135135
<color name="md_theme_onTertiaryFixedVariant_highContrast">#260D24</color>
136136
<color name="md_theme_surfaceDim_highContrast">#121318</color>
137137
<color name="md_theme_surfaceBright_highContrast">#38393F</color>
138138
<color name="md_theme_surfaceContainerLowest_highContrast">#0D0E13</color>
139-
<color name="md_theme_surfaceContainerLow_highContrast">#1A1B21</color>
139+
<color name="md_theme_surfaceContainerLow_highContrast">@color/ContainerDark</color>
140140
<color name="md_theme_surfaceContainer_highContrast">#1E1F25</color>
141141
<color name="md_theme_surfaceContainerHigh_highContrast">#292A2F</color>
142142
<color name="md_theme_surfaceContainerHighest_highContrast">#34343A</color>

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
33
<item name="colorPrimary">@color/md_theme_primary</item>
4-
<item name="colorOnPrimary">@color/md_theme_scrim</item>
4+
<item name="colorOnPrimary">@color/md_theme_onPrimary</item>
55
<item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
66
<item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
77
<item name="colorSecondary">@color/md_theme_secondary</item>
@@ -16,11 +16,11 @@
1616
<item name="colorOnError">@color/md_theme_onError</item>
1717
<item name="colorErrorContainer">@color/md_theme_errorContainer</item>
1818
<item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
19-
<item name="android:colorBackground">@color/md_theme_scrim</item>
19+
<item name="android:colorBackground">@color/md_theme_surfaceContainerLow</item>
2020
<item name="colorOnBackground">@color/md_theme_onBackground</item>
21-
<item name="colorSurface">@color/md_theme_scrim</item>
21+
<item name="colorSurface">@color/md_theme_surfaceContainerLow</item>
2222
<item name="colorOnSurface">@color/md_theme_onSurface</item>
23-
<item name="colorSurfaceVariant">@color/md_theme_scrim</item>
23+
<item name="colorSurfaceVariant">@color/md_theme_surfaceContainer</item>
2424
<item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
2525
<item name="colorOutline">@color/md_theme_outline</item>
2626
<item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
@@ -41,8 +41,8 @@
4141
<item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
4242
<item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
4343
<item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
44-
<item name="colorSurfaceContainerLowest">@color/md_theme_scrim</item>
45-
<item name="colorSurfaceContainerLow">@color/md_theme_scrim</item>
44+
<item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
45+
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
4646
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
4747
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
4848
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
@@ -58,4 +58,13 @@
5858
<style name="Dialog.Dark" parent="ThemeOverlay.Material3.MaterialAlertDialog">
5959
<item name="android:background">@color/md_theme_surfaceContainerLow</item>
6060
</style>
61+
62+
<style name="AppTheme.SuperDark" parent="AppTheme">
63+
<item name="colorOnPrimary">@color/md_theme_scrim</item>
64+
<item name="android:colorBackground">@color/md_theme_scrim</item>
65+
<item name="colorSurface">@color/md_theme_scrim</item>
66+
<item name="colorSurfaceVariant">@color/md_theme_scrim</item>
67+
<item name="colorSurfaceContainerLowest">@color/md_theme_scrim</item>
68+
<item name="colorSurfaceContainerLow">@color/md_theme_scrim</item>
69+
</style>
6170
</resources>

0 commit comments

Comments
 (0)