nightscout · MilosKozak · Dec 10, 2021 · Dec 8, 2021 · Dec 9, 2021 · Dec 10, 2021
diff --git a/wear/build.gradle b/wear/build.gradle
@@ -49,7 +49,7 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
@@ -117,8 +117,6 @@ dependencies {
     implementation project(':shared')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    //implementation files("libs/hellocharts-library-1.5.5.jar")
-    //compile "com.ustwo.android:clockwise-wearable:1.0.2"
 
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@@ -131,10 +129,12 @@ dependencies {
     implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
     implementation(name: 'wearpreferenceactivity-0.5.0', ext: 'aar')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation 'androidx.wear:wear:1.1.0'
+    implementation 'androidx.wear:wear:1.2.0'
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
+    implementation "androidx.core:core-ktx:$coreVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
     testImplementation "junit:junit:$junit_version"
     testImplementation 'org.json:json:20211205'
     testImplementation("org.mockito:mockito-core:${mockitoVersion}") {
@@ -157,9 +157,6 @@ dependencies {
     }
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     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"

diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java
@@ -1,16 +1,11 @@
 package info.nightscout.androidaps.interaction.actions;
 
-
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import androidx.core.app.NotificationManagerCompat;
-import android.support.wearable.view.DotsPageIndicator;
 import android.support.wearable.view.GridPagerAdapter;
-import android.support.wearable.view.GridViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,10 +19,8 @@
  * Created by adrian on 09/02/17.
  */
 
-
 public class AcceptActivity extends ViewSelectorActivity {
 
-
     String title = "";
     String message = "";
     String actionstring = "";
@@ -45,30 +38,25 @@ protected void onCreate(Bundle savedInstanceState) {
         message = extras.getString("message", "");
         actionstring = extras.getString("actionstring", "");
 
-        if ("".equals(message) || "".equals(actionstring) ){
-            finish(); return;
+        if ("".equals(message) || "".equals(actionstring)) {
+            finish();
+            return;
         }
 
         setContentView(R.layout.grid_layout);
-
-        final GridViewPager pager = findViewById(R.id.pager);
-        pager.setAdapter(new MyGridViewPagerAdapter());
-        DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
-        dotsPageIndicator.setPager(pager);
+        setAdapter(new MyGridViewPagerAdapter());
 
         Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         long[] vibratePattern = new long[]{0, 100, 50, 100, 50};
         v.vibrate(vibratePattern, -1);
     }
 
-
     @Override
     protected void onPause() {
         super.onPause();
         finish();
     }
 
-
     private class MyGridViewPagerAdapter extends GridPagerAdapter {
         @Override
         public int getColumnCount(int arg0) {
@@ -83,7 +71,7 @@ public int getRowCount() {
         @Override
         public Object instantiateItem(ViewGroup container, int row, int col) {
 
-            if(col == 0){
+            if (col == 0) {
                 final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_confirm_text, container, false);
                 final TextView headingView = view.findViewById(R.id.title);
                 headingView.setText(title);
@@ -110,37 +98,37 @@ public void onClick(View v) {
         public void destroyItem(ViewGroup container, int row, int col, Object view) {
             // Handle this to get the data before the view is destroyed?
             // Object should still be kept by this, just setup for reinit?
-            container.removeView((View)view);
+            container.removeView((View) view);
         }
 
         @Override
         public boolean isViewFromObject(View view, Object object) {
-            return view==object;
+            return view == object;
         }
 
     }
 
     @Override
-    public synchronized void onDestroy(){
+    public synchronized void onDestroy() {
         super.onDestroy();
-        if(dismissThread != null){
+        if (dismissThread != null) {
             dismissThread.invalidate();
         }
 
     }
 
-    private class DismissThread extends Thread{
+    private class DismissThread extends Thread {
         private boolean valid = true;
 
-        public synchronized void invalidate(){
+        public synchronized void invalidate() {
             valid = false;
         }
 
         @Override
         public void run() {
             SystemClock.sleep(60 * 1000);
             synchronized (this) {
-                if(valid) {
+                if (valid) {
                     AcceptActivity.this.finish();
                 }
             }
@@ -150,11 +138,11 @@ public void run() {
     @Override
     protected synchronized void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if(dismissThread != null) dismissThread.invalidate();
+        if (dismissThread != null) dismissThread.invalidate();
         Bundle extras = intent.getExtras();
         Intent msgIntent = new Intent(this, AcceptActivity.class);
         msgIntent.putExtras(extras);
         startActivity(msgIntent);
         finish();
     }
-}
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java
@@ -1,15 +1,11 @@
 package info.nightscout.androidaps.interaction.actions;
 
-
 import android.os.Bundle;
-import android.support.wearable.view.DotsPageIndicator;
 import android.support.wearable.view.GridPagerAdapter;
-import android.support.wearable.view.GridViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import java.text.DecimalFormat;
 
@@ -22,7 +18,6 @@
  * Created by adrian on 09/02/17.
  */
 
-
 public class BolusActivity extends ViewSelectorActivity {
 
     PlusMinusEditText editCarbs;
@@ -31,32 +26,7 @@ public class BolusActivity extends ViewSelectorActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.grid_layout);
-
-        final TextView title = findViewById(R.id.title);
-        title.setText(getString(R.string.menu_bolus));
-
-        final GridViewPager pager = findViewById(R.id.pager);
-        pager.setAdapter(new MyGridViewPagerAdapter());
-        DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
-        dotsPageIndicator.setPager(pager);
-        pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
-                dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
-                        columnOffsetPixels);
-            }
-            @Override
-            public void onPageSelected(int row, int column) {
-                dotsPageIndicator.onPageSelected(row, column);
-                View view = pager.getChildAt(column);
-                view.requestFocus();
-            }
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                dotsPageIndicator.onPageScrollStateChanged(state);
-            }
-        });
+        setAdapter(new MyGridViewPagerAdapter());
     }
 
     @Override
@@ -108,10 +78,8 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
                 confirmbutton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-
                         //check if it can happen that the fagment is never created that hold data?
                         // (you have to swipe past them anyways - but still)
-
                         String actionstring = "bolus " + SafeParse.stringToDouble(editInsulin.editText.getText().toString())
                                 + " " + SafeParse.stringToInt(editCarbs.editText.getText().toString());
                         ListenerService.initiateAction(BolusActivity.this, actionstring);
@@ -135,6 +103,5 @@ public boolean isViewFromObject(View view, Object object) {
             return view == object;
         }
 
-
     }
-}
+}
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java
@@ -1,15 +1,11 @@
 package info.nightscout.androidaps.interaction.actions;
 
-
 import android.os.Bundle;
-import android.support.wearable.view.DotsPageIndicator;
 import android.support.wearable.view.GridPagerAdapter;
-import android.support.wearable.view.GridViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import java.text.DecimalFormat;
 
@@ -22,7 +18,6 @@
  * Created by adrian on 09/02/17.
  */
 
-
 public class CPPActivity extends ViewSelectorActivity {
 
     PlusMinusEditText editPercentage;
@@ -46,42 +41,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (timeshift < 0) timeshift += 24;
 
-        setContentView(R.layout.grid_layout);
-
-        final TextView title = findViewById(R.id.title);
-        title.setText(getString(R.string.status_cpp));
-
-        final GridViewPager pager = findViewById(R.id.pager);
-        pager.setAdapter(new MyGridViewPagerAdapter());
-        DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
-        dotsPageIndicator.setPager(pager);
-        pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
-                dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
-                        columnOffsetPixels);
-            }
-            @Override
-            public void onPageSelected(int row, int column) {
-                dotsPageIndicator.onPageSelected(row, column);
-                View view = pager.getChildAt(column);
-                view.requestFocus();
-            }
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                dotsPageIndicator.onPageScrollStateChanged(state);
-            }
-        });
+        setAdapter(new MyGridViewPagerAdapter());
     }
 
-
     @Override
     protected void onPause() {
         super.onPause();
         finish();
     }
 
-
     private class MyGridViewPagerAdapter extends GridPagerAdapter {
         @Override
         public int getColumnCount(int arg0) {
@@ -151,6 +119,5 @@ public boolean isViewFromObject(View view, Object object) {
             return view == object;
         }
 
-
     }
 }