From 12656be044251e95d1b911390b9869fb8e3c6a3d Mon Sep 17 00:00:00 2001 From: osodebailar Date: Sat, 19 Mar 2022 15:40:08 +0100 Subject: [PATCH] fix for missing Actionbar , wrong colors of numbepicker in profilhelper and minor optical issue --- .../main/java/info/nightscout/androidaps/MainActivity.kt | 2 -- .../androidaps/activities/ProfileHelperActivity.kt | 2 +- app/src/main/res/layout/activity_profilehelper.xml | 7 +++++-- core/src/main/res/values-night/styles.xml | 4 ++-- core/src/main/res/values/colors.xml | 2 +- core/src/main/res/values/styles.xml | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt index 02796b2b41..484f9262ff 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt @@ -95,8 +95,6 @@ class MainActivity : NoSplashAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - // temp while switch is not public - setTheme(R.style.AppTheme) Iconify.with(FontAwesomeModule()) LocaleHelper.update(applicationContext) binding = ActivityMainBinding.inflate(layoutInflater) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt index 8de1ff39d1..891228aa26 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt @@ -68,7 +68,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + setTheme(R.style.AppTheme) binding = ActivityProfilehelperBinding.inflate(layoutInflater) setContentView(binding.root) diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml index 1b41867d16..cf3d6f2ffb 100644 --- a/app/src/main/res/layout/activity_profilehelper.xml +++ b/app/src/main/res/layout/activity_profilehelper.xml @@ -15,7 +15,6 @@ @@ -46,6 +45,7 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="10dp" android:hint="@string/profiletype" android:textColorHint="?attr/tabBgColorSelected" app:boxStrokeColor="?attr/tabBgColorSelected"> @@ -54,7 +54,6 @@ android:id="@+id/profiletype" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" android:clickable="true" android:cursorVisible="false" android:focusable="false" @@ -83,6 +82,7 @@ android:layout_width="150dp" android:layout_height="wrap_content" android:layout_marginStart="10dp" + android:layout_marginTop="4dp" android:text="@string/age" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> @@ -90,6 +90,7 @@ android:id="@+id/age" android:layout_width="130dp" android:layout_height="40dp" + android:layout_marginTop="4dp" android:layout_marginBottom="2dp" app:customContentDescription="@string/age" /> @@ -106,6 +107,7 @@ android:layout_width="150dp" android:layout_height="wrap_content" android:layout_marginStart="10dp" + android:layout_marginTop="1dp" android:text="@string/tdd_total" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> @@ -113,6 +115,7 @@ android:id="@+id/tdd" android:layout_width="130dp" android:layout_height="40dp" + android:layout_marginTop="1dp" android:layout_marginBottom="2dp" app:customContentDescription="@string/tdd_total" /> diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml index fb9611ebed..006421aae9 100644 --- a/core/src/main/res/values-night/styles.xml +++ b/core/src/main/res/values-night/styles.xml @@ -1,7 +1,7 @@ - - -