caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1463 from osodebailar/fix/fix-for-missing-actionbar-and-wrong_number-picker-color

Browse source 
#1425 fix for missing Actionbar , wrong colors of numbepicker in profilhelper
This commit is contained in:
Milos Kozak 2022-03-19 17:32:48 +01:00 committed by GitHub
parent 3212e9d906 12656be044
commit e1bcad2c2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,8 +95,6 @@ class MainActivity : NoSplashAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
// temp while switch is not public
setTheme(R.style.AppTheme)
Iconify.with(FontAwesomeModule()) Iconify.with(FontAwesomeModule())
LocaleHelper.update(applicationContext) LocaleHelper.update(applicationContext)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)

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

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

7
app/src/main/res/layout/activity_profilehelper.xml
View file

@ -15,7 +15,6 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="?attr/defaultbackground" android:background="?attr/defaultbackground"
android:orientation="horizontal"> android:orientation="horizontal">
@ -46,6 +45,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:hint="@string/profiletype" android:hint="@string/profiletype"
android:textColorHint="?attr/tabBgColorSelected" android:textColorHint="?attr/tabBgColorSelected"
app:boxStrokeColor="?attr/tabBgColorSelected"> app:boxStrokeColor="?attr/tabBgColorSelected">
@ -54,7 +54,6 @@
android:id="@+id/profiletype" android:id="@+id/profiletype"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:clickable="true" android:clickable="true"
android:cursorVisible="false" android:cursorVisible="false"
android:focusable="false" android:focusable="false"
@ -83,6 +82,7 @@
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="4dp"
android:text="@string/age" android:text="@string/age"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@ -90,6 +90,7 @@
android:id="@+id/age" android:id="@+id/age"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
app:customContentDescription="@string/age" /> app:customContentDescription="@string/age" />
@ -106,6 +107,7 @@
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="1dp"
android:text="@string/tdd_total" android:text="@string/tdd_total"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@ -113,6 +115,7 @@
android:id="@+id/tdd" android:id="@+id/tdd"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
app:customContentDescription="@string/tdd_total" /> app:customContentDescription="@string/tdd_total" />

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:ns2="http://schemas.android.com/tools"> <resources xmlns:ns2="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/secondaryColorDefault</item> <item name="colorAccent">@color/secondaryColorDefault</item>
@ -230,7 +230,7 @@
</style> </style>
<!-- The launcher theme. It sets the main window background to the launch_screen drawable --> <!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
<style name="AppTheme.Launcher" parent="AppTheme"> <style name="AppTheme.Launcher" parent="AppTheme.NoActionBar">
<item name="android:windowBackground">@drawable/launch_screen</item> <item name="android:windowBackground">@drawable/launch_screen</item>
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding--> <!-- 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> --> <!-- <item name="colorPrimaryDark">@android:color/white</item> -->

2
core/src/main/res/values/colors.xml
View file

@ -25,7 +25,7 @@
<color name="overviewPillColorDefault">#1c171c</color> <color name="overviewPillColorDefault">#1c171c</color>
<color name="colorOnPrimaryDefault">#FFFFFF</color> <color name="colorOnPrimaryDefault">#FFFFFF</color>
<color name="defaultbackground">#999999</color> <color name="defaultbackground">#424242</color>
<color name="defaulttextcolor">#B3FFFFFF</color> <color name="defaulttextcolor">#B3FFFFFF</color>
<!-- Tabs--> <!-- Tabs-->

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:ns2="http://schemas.android.com/tools"> <resources xmlns:ns2="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar"> <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@android:color/holo_blue_light</item> <item name="colorAccent">@android:color/holo_blue_light</item>
@ -230,7 +230,7 @@
</style> </style>
<!-- The launcher theme. It sets the main window background to the launch_screen drawable --> <!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
<style name="AppTheme.Launcher" parent="AppTheme"> <style name="AppTheme.Launcher" parent="AppTheme.NoActionBar">
<item name="android:windowBackground">@drawable/launch_screen</item> <item name="android:windowBackground">@drawable/launch_screen</item>
<!-- Optional, on Android 5+ you can modify the colorPrimaryDark color to match the windowBackground color for further branding--> <!-- 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> --> <!-- <item name="colorPrimaryDark">@android:color/white</item> -->