caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1467 from osodebailar/fix/final-fix-for-minor-aestehtic-bug-except-numberpicker

Browse source 
fix for dark mode minor aesthetic bug - not included numberpicker
This commit is contained in:
Milos Kozak 2022-03-20 16:27:30 +01:00 committed by GitHub
commit 3885b5560b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
View file

@ -68,7 +68,6 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setTheme(R.style.AppTheme)
binding = ActivityProfilehelperBinding.inflate(layoutInflater)
setContentView(binding.root)

2
app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
View file

@ -50,8 +50,6 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// temp while switch is not public
setTheme(R.style.AppTheme)
update(applicationContext)
binding = ActivitySetupwizardBinding.inflate(layoutInflater)
setContentView(binding.root)

2
core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
View file

@ -32,8 +32,6 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// temp while switch is not public
setTheme(R.style.AppTheme)
binding = MaintenanceImportListActivityBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)

32
core/src/main/res/values-night/styles.xml
View file

@ -113,12 +113,11 @@
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
<style name="AppTheme.NoActionBar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<style name="AppTheme.NoActionBar" parent="AppTheme">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeCloseDrawable">@drawable/ic_close</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<!-- BolusProgress, Error -->
@ -193,6 +192,11 @@
<item name="android:textSize">15sp</item>
</style>
<style name="Test" parent="AppTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<!-- Alert Dialogs -->
<style name="DialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
<item name="backgroundColor">@color/dialog_title_background</item>
@ -235,4 +239,24 @@
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding-->
<!-- <item name="colorPrimaryDark">@android:color/white</item> -->
</style>
<style name="section_header_label">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">15dp</item>
<item name="android:paddingStart">15dp</item>
<item name="android:paddingEnd">15dp</item>
<item name="android:textColor">@color/colorAccent</item>
</style>
<style name="warning_label">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">5dp</item>
<item name="android:layout_marginBottom">5dp</item>
<item name="android:paddingStart">15dp</item>
<item name="android:paddingEnd">15dp</item>
<item name="android:textAlignment">center</item>
<item name="android:textColor">#ff0000</item>
</style>
</resources>

9
core/src/main/res/values/styles.xml
View file

@ -108,16 +108,17 @@
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item>
<item name="alertDialogTheme">@style/DialogTheme</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
<style name="AppTheme.NoActionBar" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<style name="AppTheme.NoActionBar" parent="AppTheme">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeCloseDrawable">@drawable/ic_close</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<!-- BolusProgress, Error -->