Wear: add dependency injection

wear/build.gradle

@@ -12,17 +12,13 @@ buildscript {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
-jacoco {
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
-    toolVersion = "0.8.7"
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
-}
 
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
-}
 
 ext {
     wearableVersion = "2.8.1"
@@ -159,6 +155,17 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+
+    // for old fashioned support-app version
+    implementation "com.google.dagger:dagger:$dagger_version"
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
 }
 repositories {
     mavenCentral()

wear/src/main/java/info/nightscout/androidaps/Aaps.java

@@ -9,12 +9,16 @@ import android.preference.PreferenceManager;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import dagger.android.AndroidInjector;
+import dagger.android.DaggerApplication;
+import info.nightscout.androidaps.di.DaggerAppComponent;
+
 /**
  * Created for xDrip+ by Emma Black on 3/21/15.
  * Adapted for AAPS by dlvoy 2019-11-06.
  */
 
-public class Aaps extends Application implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class Aaps extends DaggerApplication implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     @SuppressLint("StaticFieldLeak")
     private static Context context;
@@ -30,6 +34,14 @@ public class Aaps extends Application implements SharedPreferences.OnSharedPrefe
         super.onCreate();
     }
 
+    @Override
+    protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
+        return DaggerAppComponent
+                .builder()
+                .application(this)
+                .build();
+    }
+
     private void updatePrefs(SharedPreferences sharedPrefs) {
         unicodeComplications = sharedPrefs.getBoolean("complication_unicode", true);
         complicationTapAction = sharedPrefs.getString("complication_tap_action", "default");

wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java

@@ -9,10 +9,6 @@ import info.nightscout.androidaps.data.RawDisplayData;
 import info.nightscout.androidaps.interaction.utils.DisplayFormat;
 import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
 
-import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
-import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_COB;
-import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_IOB;
-
 /*
  * Created by dlvoy on 2019-11-12
  */
@@ -25,8 +21,8 @@ public class BrCobIobComplication extends BaseComplicationProviderService {
         ComplicationData complicationData = null;
 
         if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
-            final String cob = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE).minimise(MIN_FIELD_LEN_COB);
+            final String cob = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE).minimise(DisplayFormat.MIN_FIELD_LEN_COB);
-            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(Math.max(MIN_FIELD_LEN_IOB, (MAX_FIELD_LEN_SHORT -1) - cob.length()));
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(Math.max(DisplayFormat.MIN_FIELD_LEN_IOB, (DisplayFormat.MAX_FIELD_LEN_SHORT -1) - cob.length()));
 
             final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
                     .setShortText(ComplicationText.plainText(DisplayFormat.basalRateSymbol()+raw.sBasalRate))

wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java

@@ -6,10 +6,9 @@ import android.support.wearable.complications.ComplicationText;
 import android.util.Log;
 
 import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
 import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
 
-import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
-
 /*
  * Created by dlvoy on 2019-11-12
  */
@@ -23,7 +22,7 @@ public class CobIobComplication extends BaseComplicationProviderService {
 
         if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
             final String cob = raw.sCOB2;
-            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(DisplayFormat.MAX_FIELD_LEN_SHORT);
 
             final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
                     .setShortText(ComplicationText.plainText(cob))

wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java

@@ -8,10 +8,9 @@ import android.util.Log;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
 import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
 
-import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
-
 /*
  * Created by dlvoy on 2019-11-12
  */
@@ -24,7 +23,7 @@ public class IobIconComplication extends BaseComplicationProviderService {
         ComplicationData complicationData = null;
 
         if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
-            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(DisplayFormat.MAX_FIELD_LEN_SHORT);
 
             final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
                     .setShortText(ComplicationText.plainText(iob))

wear/src/main/java/info/nightscout/androidaps/di/AppComponent.kt

@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.di
+
+import dagger.BindsInstance
+import dagger.Component
+import dagger.android.AndroidInjectionModule
+import dagger.android.AndroidInjector
+import info.nightscout.androidaps.Aaps
+import javax.inject.Singleton
+
+@Singleton
+@Component(
+    modules = [
+        AndroidInjectionModule::class,
+        WearModule::class
+    ]
+)
+interface AppComponent : AndroidInjector<Aaps> {
+
+    @Component.Builder
+    interface Builder {
+
+        @BindsInstance
+        fun application(aaps: Aaps): Builder
+
+        fun build(): AppComponent
+    }
+}

wear/src/main/java/info/nightscout/androidaps/di/WearModule.kt

@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.di
+
+import android.content.Context
+import dagger.Binds
+import dagger.Module
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Aaps
+
+@Suppress("unused")
+@Module(includes = [
+    WearModule.AppBindings::class
+])
+open class WearModule {
+
+    @Module
+    interface AppBindings {
+
+        @Binds fun bindContext(aaps: Aaps): Context
+        @Binds fun bindInjector(aaps: Aaps): HasAndroidInjector
+    }
+}
+

wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java

@@ -15,12 +15,14 @@ import java.util.Map;
 import java.util.Set;
 
 import info.nightscout.androidaps.Aaps;
+import javax.inject.Singleton;
 
 /**
  * Created by andy on 3/5/19.
  * Adapted by dlvoy on 2019-11-06 using code from jamorham JoH class
  */
 
+@Singleton
 public class WearUtil {
 
     private final static boolean debug_wakelocks = false;