From 819a3b7d43dce2897676f857e0fd76b68ba467b5 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 8 Jan 2021 01:15:48 +0100
Subject: [PATCH] downgrade gradle and fix mixed localisation comparison

---
 build.gradle                                                  | 2 +-
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 .../androidaps/interaction/menus/MainMenuActivity.java        | 4 ++--
 wear/src/main/res/values/strings.xml                          | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a3bf3788cd..87f1d32bd3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e53b7051f9..9a5b8e899d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
index 50ee1ad8ee..d7029fafbf 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java
@@ -39,8 +39,8 @@ public class MainMenuActivity extends MenuListActivity {
 
         if(!sharedPreferences.getBoolean("wearcontrol", false)){
             return new String[] {
-                    "Settings",
-                    "Re-Sync"};
+                    aaps.gs(R.string.menu_settings),
+                    aaps.gs(R.string.menu_resync)};
         }
 
 
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 4685ce2a08..3f455b036b 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -77,6 +77,7 @@
     <string name="menu_ecarb">eCarb</string>
     <string name="menu_settings">Settings</string>
     <string name="menu_status">Status</string>
+    <string name="menu_resync">Re-Sync</string>
     <string name="menu_prime_fill">Prime/Fill</string>
     <string name="menu_none">None</string>
     <string name="menu_default">Default</string>