Merge remote-tracking branch 'origin/dev' into rs

app/build.gradle

@@ -30,8 +30,6 @@ ext {
     dexmakerVersion = "1.2"
     retrofit2Version = '2.8.1'
     okhttp3Version = '4.6.0'
-    coroutinesVersion = '1.3.5'
-    activityVersion = '1.2.0-alpha03'
 }
 
 

app/src/main/res/values/strings.xml

@@ -1113,7 +1113,6 @@
     <string name="nav_setupwizard">Setup Wizard</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
-    <string name="key_language" translatable="false">language</string>
     <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
     <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
     <string name="firstinsulinincrement">First insulin increment</string>

app/src/main/res/values/styles.xml

@@ -16,12 +16,6 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
     <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>

build.gradle

@@ -10,6 +10,8 @@ buildscript {
         room_version = '2.2.5'
         lifecycle_version = '2.2.0'
         dagger_version = '2.27'
+        coroutinesVersion = '1.3.5'
+        activityVersion = '1.2.0-alpha04'
     }
     repositories {
         google()

core/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 28
@@ -30,6 +30,7 @@ android {
         }
         firebaseDisable {
             System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
         }
     }
     compileOptions {
@@ -43,6 +44,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity:${activityVersion}"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"

core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt

@@ -3,10 +3,10 @@ package info.nightscout.androidaps.activities
 import android.content.Context
 import android.os.Bundle
 import dagger.android.support.DaggerAppCompatActivity
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.LocaleHelper
 
-@Suppress("registered")
+//@Suppress("registered")
 open class NoSplashAppCompatActivity : DaggerAppCompatActivity() {
 
     public override fun onCreate(savedInstanceState: Bundle?) {

core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt

@@ -5,7 +5,7 @@ import android.content.ContextWrapper
 import android.os.Build
 import android.os.LocaleList
 import androidx.preference.PreferenceManager
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import java.util.*
 
 object LocaleHelper {

core/src/main/res/values/layout.xml

@@ -1,3 +1,10 @@
 <resources>
     <bool name="isTablet">false</bool>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
 </resources>

core/src/main/res/values/strings.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="key_enable_fabric" translatable="false">enable_fabric</string>
+    <string name="key_language" translatable="false">language</string>
+
     <string name="confirmation">Confirmation</string>
     <string name="message">Message</string>
     <string name="ok">OK</string>