Skip to content

Commit

Permalink
fix themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DerTyp7214
DerTyp7214 committed Aug 19, 2022
1 parent 0f45131 commit 4909f83
Show file tree
Hide file tree
Showing 25 changed files with 47 additions and 513 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.preference.PreferenceManager
import com.google.android.material.button.MaterialButton
import com.google.android.material.color.DynamicColors
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout
import de.dertyp7214.rboardthememanager.R
Expand All @@ -49,8 +50,9 @@ fun Activity.applyTheme(
shareFlags: Boolean = false,
installPack: Boolean = false
) {
val style = preferences.getString("app_style", "default")
setTheme(
when (preferences.getString("app_style", "default")) {
when (style) {
"blue" -> when {
main -> R.style.Theme_RboardThemeManagerV3_Main_Blue
info -> R.style.Theme_RboardThemeManagerV3_Info_Blue
Expand Down Expand Up @@ -109,6 +111,7 @@ fun Activity.applyTheme(
}
}
)
if (style == "default") DynamicColors.applyToActivityIfAvailable(this)
}

operator fun <T : ViewModel> FragmentActivity.get(modelClass: Class<T>): T =
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Preferences.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import de.dertyp7214.rboardthememanager.BuildConfig
import de.dertyp7214.rboardthememanager.Config
import de.dertyp7214.rboardthememanager.R
import de.dertyp7214.rboardthememanager.core.*
import de.dertyp7214.rboardthememanager.screens.MainActivity
import de.dertyp7214.rboardthememanager.screens.ReadMoreReadFast
import de.dertyp7214.rboardthememanager.utils.GboardUtils
import de.dertyp7214.rboardthememanager.utils.MagiskUtils
Expand Down Expand Up @@ -238,6 +239,10 @@ class Preferences(
titleRes = R.string.theme_count
summary = infoData[key] as String
iconRes = R.drawable.ic_themes
onClick {
navigations.goBackTo(MainActivity::class.java)
false
}
}
pref("theme_path") {
titleRes = R.string.theme_path
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginBottom="62dp"
android:background="?android:attr/colorBackground"
android:background="?attr/colorSurface"
android:elevation="0dp"
android:minHeight="0dp"
android:translationZ="0dp"
Expand Down
47 changes: 0 additions & 47 deletions app/src/main/res/values-night-v30/themes_blue.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,51 +27,4 @@
<item name="colorSurfaceInverse">@color/blue_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/blue_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Blue" parent="Theme.RboardThemeManager.Colors_blue">

<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Blue</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Blue</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Blue</item>
</style>

<style name="Widget.App.Snackbar_Blue" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Blue" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Blue" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Blue" parent="Theme.RboardThemeManagerV3_Blue" />

<style name="Theme.RboardThemeManagerV3.Info_Blue" parent="Theme.RboardThemeManagerV3_Blue">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Blue" parent="Theme.RboardThemeManagerV3_Blue">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
<style name="Theme.RboardThemeManagerV3.ShareFlags_Blue" parent="Theme.RboardThemeManagerV3_Blue">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
47 changes: 0 additions & 47 deletions app/src/main/res/values-night-v30/themes_green.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,51 +27,4 @@
<item name="colorSurfaceInverse">@color/green_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/green_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Green" parent="Theme.RboardThemeManager.Colors_green">
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="alertDialogTheme">@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Green</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Green</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Green</item>
</style>

<style name="Widget.App.Snackbar_Green" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Green" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Green" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Green" parent="Theme.RboardThemeManagerV3_Green" />

<style name="Theme.RboardThemeManagerV3.Info_Green" parent="Theme.RboardThemeManagerV3_Green">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Green" parent="Theme.RboardThemeManagerV3_Green">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
<style name="Theme.RboardThemeManagerV3.ShareFlags_Green" parent="Theme.RboardThemeManagerV3_Green">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
46 changes: 0 additions & 46 deletions app/src/main/res/values-night-v30/themes_lime.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,4 @@
<item name="colorSurfaceInverse">@color/lime_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/lime_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Lime" parent="Theme.RboardThemeManager.Colors_lime">
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Lime</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Lime</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Lime</item>
</style>

<style name="Widget.App.Snackbar_Lime" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Lime" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Lime" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Lime" parent="Theme.RboardThemeManagerV3_Lime" />

<style name="Theme.RboardThemeManagerV3.Info_Lime" parent="Theme.RboardThemeManagerV3_Lime">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Lime" parent="Theme.RboardThemeManagerV3_Lime">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
<style name="Theme.RboardThemeManagerV3.ShareFlags_Lime" parent="Theme.RboardThemeManagerV3_Lime">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
46 changes: 0 additions & 46 deletions app/src/main/res/values-night-v30/themes_orange.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,4 @@
<item name="colorSurfaceInverse">@color/orange_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/orange_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Orange" parent="Theme.RboardThemeManager.Colors_orange">
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Orange</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Orange</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Orange</item>
</style>

<style name="Widget.App.Snackbar_Orange" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Orange" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Orange" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Orange" parent="Theme.RboardThemeManagerV3_Orange" />

<style name="Theme.RboardThemeManagerV3.Info_Orange" parent="Theme.RboardThemeManagerV3_Orange">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Orange" parent="Theme.RboardThemeManagerV3_Orange">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
<style name="Theme.RboardThemeManagerV3.ShareFlags_Orange" parent="Theme.RboardThemeManagerV3_Orange">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
46 changes: 0 additions & 46 deletions app/src/main/res/values-night-v30/themes_pink.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,4 @@
<item name="colorSurfaceInverse">@color/pink_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/pink_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Pink" parent="Theme.RboardThemeManager.Colors_pink">
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Pink</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Pink</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Pink</item>
</style>

<style name="Widget.App.Snackbar_Pink" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Pink" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Pink" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Pink" parent="Theme.RboardThemeManagerV3_Pink" />

<style name="Theme.RboardThemeManagerV3.Info_Pink" parent="Theme.RboardThemeManagerV3_Pink">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Pink" parent="Theme.RboardThemeManagerV3_Pink">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
<style name="Theme.RboardThemeManagerV3.ShareFlags_Pink" parent="Theme.RboardThemeManagerV3_Pink">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
47 changes: 0 additions & 47 deletions app/src/main/res/values-night-v30/themes_red.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,51 +27,4 @@
<item name="colorSurfaceInverse">@color/red_md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/red_md_theme_dark_inversePrimary</item>
</style>

<!-- Base application theme. -->
<style name="Theme.RboardThemeManagerV3_Red" parent="Theme.RboardThemeManager.Colors_red">
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>

<item name="android:statusBarColor">?android:attr/colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>

<item name="floatingActionButtonStyle">?floatingActionButtonSecondaryStyle</item>
<item name="popupMenuStyle">@style/PopupStyle</item>
<item name="materialAlertDialogTheme">
@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
</item>

<item name="snackbarStyle">@style/Widget.App.Snackbar_Red</item>
<item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Red</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Red</item>
</style>

<style name="Widget.App.Snackbar_Red" parent="Widget.Material3.Snackbar">
<item name="backgroundTint">?attr/colorBackgroundFloating</item>
</style>

<style name="Widget.App.SnackbarTextView_Red" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/text</item>
</style>

<style name="Widget.App.SnackbarButton_Red" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textAllCaps">true</item>
<item name="android:textColor">?attr/colorAccent</item>
</style>

<style name="Theme.RboardThemeManagerV3.Main_Red" parent="Theme.RboardThemeManagerV3_Red" />

<style name="Theme.RboardThemeManagerV3.Info_Red" parent="Theme.RboardThemeManagerV3_Red">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.RboardThemeManagerV3.InstallPack_Red" parent="Theme.RboardThemeManagerV3_Red">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>

<style name="Theme.RboardThemeManagerV3.ShareFlags_Red" parent="Theme.RboardThemeManagerV3_Red">
<item name="android:statusBarColor">?attr/colorSurfaceVariant</item>
</style>
</resources>
Loading

0 comments on commit 4909f83

Please sign in to comment.