Minor improvements: release

madduck · Dec 27, 2021 · 629ed6d · 629ed6d
1 parent 37539d0
commit 629ed6d
Show file tree

Hide file tree

Showing 20 changed files with 128 additions and 67 deletions.
diff --git a/AndroidManifestALLPhoneTablet.xml b/AndroidManifestALLPhoneTablet.xml
@@ -15,4 +15,7 @@
     </application>
 -->
 
+    <!-- tools:overrideLibrary="androidx.wear, androidx.wear.input" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
+    <uses-sdk tools:overrideLibrary="androidx.wear, androidx.wear.input"/>
+
 </manifest>
diff --git a/AndroidManifestALLPhoneTabletPre22.xml b/AndroidManifestALLPhoneTabletPre22.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <supports-screens
+            android:anyDensity="true"
+            android:xlargeScreens="true"
+            android:largeScreens="true"
+            android:normalScreens="true"
+            android:smallScreens="false"
+             />
+
+<!--
+    <application tools:replace="android:appComponentFactory">
+    </application>
+-->
+
+    <!-- tools:overrideLibrary="androidx.wear, androidx.wear.input" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
+    <uses-sdk tools:overrideLibrary="androidx.wear, androidx.wear.input"/>
+
+</manifest>
diff --git a/AndroidManifestBadminton.xml b/AndroidManifestBadminton.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
           package="com.doubleyellow.badminton">
-<!--
-          android:versionName="${versionNameBadminton}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixBadminton}"
--->
 <!-- PlayStoreID=4974076001360456618 -->
 
 <!--
@@ -43,9 +39,6 @@
     <uses-feature android:name="android.hardware.touchscreen"            android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"                   android:required="false"/>
 
-    <!-- tools:overrideLibrary="androidx.wear" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
-    <uses-sdk tools:overrideLibrary="androidx.wear"/>
-
 <!--
     <supports-screens
             android:anyDensity="true"

diff --git a/AndroidManifestRacketlon.xml b/AndroidManifestRacketlon.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="com.doubleyellow.racketlon">
-<!--
-    android:versionName="${versionNameRacketlon}"
-    android:versionCode="${versionCodePrefix}${versionCodeSuffixRacketlon}"
--->
     <!-- PlayStoreID=4973204554147732137 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />
@@ -42,9 +38,6 @@
     <uses-feature android:name="android.hardware.touchscreen"            android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"                   android:required="false"/>
 
-    <!-- tools:overrideLibrary="androidx.wear" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
-    <uses-sdk tools:overrideLibrary="androidx.wear"/>
-
 <!--
     <supports-screens
             android:anyDensity="true"

diff --git a/AndroidManifestSquore.xml b/AndroidManifestSquore.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="com.doubleyellow.scoreboard">
-<!--
-    android:versionName="${versionNameSquore}"
-    android:versionCode="${versionCodePrefix}${versionCodeSuffixSquore}"
--->
     <!-- PlayStoreID=4972255383319852172 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />
@@ -42,9 +38,6 @@
     <uses-feature android:name="android.hardware.touchscreen"            android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"                   android:required="false"/>
 
-    <!-- tools:overrideLibrary="androidx.wear" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
-    <uses-sdk tools:overrideLibrary="androidx.wear"/>
-
 <!--
     <supports-screens
             android:anyDensity="true"

diff --git a/AndroidManifestTabletennis.xml b/AndroidManifestTabletennis.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
           package="com.doubleyellow.tabletennis">
-<!--
-          android:versionName="${versionNameTabletennis}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixTabletennis}"
--->
     <!-- PlayStoreID=4975506867766261096 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />
@@ -42,9 +38,6 @@
     <uses-feature android:name="android.hardware.touchscreen"            android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"                   android:required="false"/>
 
-    <!-- tools:overrideLibrary="androidx.wear" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
-    <uses-sdk tools:overrideLibrary="androidx.wear"/>
-
 <!--
     <supports-screens
             android:anyDensity="true"

diff --git a/AndroidManifestTennisPadel.xml b/AndroidManifestTennisPadel.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
           package="com.doubleyellow.tennispadel">
-<!--
-          android:versionName="${versionNameTennisPadel}"
-          android:versionCode="${versionCodePrefix}${versionCodeSuffixTennisPadel}"
--->
     <!-- PlayStoreID=4972207514792479457 -->
 <!--
     <uses-feature android:name="android.permission.SEND_SMS" android:required="false" />
@@ -42,9 +38,6 @@
     <uses-feature android:name="android.hardware.touchscreen"            android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"                   android:required="false"/>
 
-    <!-- tools:overrideLibrary="androidx.wear" to be able to compile wearable functionality into non-wear app assuming it will not be invoked -->
-    <uses-sdk tools:overrideLibrary="androidx.wear"/>
-
 <!--
     <supports-screens
             android:anyDensity="true"

diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,11 @@ buildscript {
 }
 // Run ./gradlew -q :dependencies
 android {
+    compileOptions {
+        // added when going from 1.1.9 to androidx.wear:wear:1.2.0
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 
     compileSdkVersion 31
     // buildToolsVersion not required for gradle 3.0.0 and higher (e.g. when using wrapper)
@@ -73,7 +78,7 @@ android {
                 // exclude '**/layout-watch/**' // e.g. for non-wear does not work for resources
             }
         }
-        phoneTabletPre22  { manifest { srcFile 'AndroidManifestALLPhoneTablet.xml' } }
+        phoneTabletPre22  { manifest { srcFile 'AndroidManifestALLPhoneTabletPre22.xml' } }
         phoneTabletPost23 { manifest { srcFile 'AndroidManifestALLPhoneTablet.xml' } }
         wearOs            { manifest { srcFile 'AndroidManifestALLWearOS.xml'      } }
     }
@@ -97,22 +102,22 @@ android {
             dimension "devicetype"
             minSdkVersion 19
             targetSdkVersion 30
-            versionCode 1915 * 10000 + 471
-            versionName "4.42"
+            versionCode 1915 * 10000 + 472
+            versionName "4.44"
         }
         phoneTabletPost23 {
             dimension "devicetype"
             minSdkVersion 23
             targetSdkVersion 30
-            versionCode 2315 * 10000 + 471
-            versionName "4.42"
+            versionCode 2315 * 10000 + 472
+            versionName "4.44"
         }
         wearOs {
             dimension "devicetype"
             minSdkVersion 25    // 25 for Wear2.0 (23 would suffice for Wear1.0)
             targetSdkVersion 30
-            versionCode 2501 * 10000 + 471
-            versionName "4.42"
+            versionCode 2501 * 10000 + 472
+            versionName "4.44"
         }
     }
     buildTypes {
@@ -157,9 +162,13 @@ dependencies {
     implementation 'com.doubleyellow:AndroidBase@aar'
     // uncommenting this while in Android Studio creates a subdir AndroidBase with an .iml file in it
 
-    //implementation 'com.google.android.material:material:1.2.0-alpha05'
+    phoneTabletPre22Implementation  'androidx.wear:wear:1.2.0'
+    phoneTabletPost23Implementation 'androidx.wear:wear:1.2.0' // minSdk=23 for 1.[0-2].0
+    wearOsImplementation            'androidx.wear:wear:1.2.0'
+    phoneTabletPre22Implementation  'androidx.wear:wear-input:1.1.0'// comment out this line temporarily what code will lead to errors when invocation is not prevented using Build.VERSION.SDK_INT > Build.VERSION_CODES.?
+    phoneTabletPost23Implementation 'androidx.wear:wear-input:1.1.0'// minSdk=25 
+    wearOsImplementation            'androidx.wear:wear-input:1.1.0'
 
-    implementation 'androidx.wear:wear:1.1.0' // does somehow not compile with wear 1.2.0. can not be set to compileOnly for Pre22 somehow because of boxedEdges in res/layout-watch/percentage.xml
     //wearOsImplementation 'androidx.wear:wear:1.0.0' // needs minSdkVersion=23
     //implementation 'com.android.support:wear:28.0.0' // needs minSdkVersion=23
     //implementation 'com.google.protobuf:protobuf-java:3.5.1'
@@ -168,15 +177,12 @@ dependencies {
 
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
 
-//    implementation 'androidx.legacy:legacy-support-v4:1.0.0'   // v4 not required for building
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.3.1' // moving from 1.3.1 to 1.4.0 makes e.g. android wear in emulator fail
     // not required for building, BUT required for runtime when using newer gradle (20191022)
 
   //implementation 'androidx.legacy:legacy-support-v13:1.0.0'
 
     // ChromeCast (new with Custom Receiver)
-    //compile 'com.android.support:appcompat-v7:28.0.0'   // Multiple dex files define Landroid/support/v13/view/DragAndDropPermissionsCompat
-    //compile 'com.android.support:mediarouter-v7:28.0.0' // Multiple dex files define Landroid/support/v13/view/DragAndDropPermissionsCompat
     phoneTabletPre22Implementation  'com.google.android.gms:play-services-cast-framework:19.0.0'
     phoneTabletPost23Implementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
     wearOsImplementation            'com.google.android.gms:play-services-cast-framework:19.0.0'

diff --git a/libs/AndroidBase.aar b/libs/AndroidBase.aar
diff --git a/res/raw/changelog.md b/res/raw/changelog.md
@@ -1,3 +1,10 @@
+## 4.44 (jan 2022)
+
+- Improvement for wearables:
+    - allow scoring points with hardware buttons (if 2 additional hardware buttons are available besides the main OS button)
+- Color preferences from phone synced to wearable (experimental)    
+- Other minor improvements
+
 ## 4.43 (dec 2021)
 
 - feed improvements for team vs team: 

diff --git a/res/raw/changelog_badminton.md b/res/raw/changelog_badminton.md
@@ -1,3 +1,16 @@
+## 4.44 (jan 2022)
+
+- Improvement for wearables:
+    - allow scoring points with hardware buttons (if 2 additional hardware buttons are available besides the main OS button)
+- Color preferences from phone synced to wearable (experimental)    
+- Other minor improvements
+
+## 4.43 (dec 2021)
+
+- feed improvements for team vs team: 
+    - allow specifying player `teamPlayers.avatar`
+    - allow specifying team `team.abbreviation` and team `team.color`
+
 ## 4.42 (okt 2021)
 
 - Bugfix for feeds for Android Pie (Android 9, 2018, SDK 28) and older

diff --git a/res/raw/changelog_racketlon.md b/res/raw/changelog_racketlon.md
@@ -1,3 +1,16 @@
+## 4.44 (jan 2022)
+
+- Improvement for wearables:
+    - allow scoring points with hardware buttons (if 2 additional hardware buttons are available besides the main OS button)
+- Color preferences from phone synced to wearable (experimental)    
+- Other minor improvements
+
+## 4.43 (dec 2021)
+
+- feed improvements for team vs team: 
+    - allow specifying player `teamPlayers.avatar`
+    - allow specifying team `team.abbreviation` and team `team.color`
+
 ## 4.42 (okt 2021)
 
 - Bugfix for feeds for Android Pie (Android 9, 2018, SDK 28) and older

diff --git a/res/raw/changelog_tabletennis.md b/res/raw/changelog_tabletennis.md
@@ -1,3 +1,16 @@
+## 4.44 (jan 2022)
+
+- Improvement for wearables:
+    - allow scoring points with hardware buttons (if 2 additional hardware buttons are available besides the main OS button)
+- Color preferences from phone synced to wearable (experimental)    
+- Other minor improvements
+
+## 4.43 (dec 2021)
+
+- feed improvements for team vs team: 
+    - allow specifying player `teamPlayers.avatar`
+    - allow specifying team `team.abbreviation` and team `team.color`
+
 ## 4.42 (okt 2021)
 
 - Fix in doubles receiver indication

diff --git a/res/raw/changelog_tennispadel.md b/res/raw/changelog_tennispadel.md
@@ -1,3 +1,16 @@
+## 4.44 (jan 2022)
+
+- Improvement for wearables:
+    - allow scoring points with hardware buttons (if 2 additional hardware buttons are available besides the main OS button)
+- Color preferences from phone synced to wearable (experimental)    
+- Other minor improvements
+
+## 4.43 (dec 2021)
+
+- feed improvements for team vs team: 
+    - allow specifying player `teamPlayers.avatar`
+    - allow specifying team `team.abbreviation` and team `team.color`
+
 ## 4.42 (okt 2021)
 
 - Improvement for wearables:

diff --git a/res/values/colors.xml b/res/values/colors.xml
@@ -73,22 +73,26 @@
     </string-array>
 
     <!-- black|red|grey ... -->
+<!--
     <string-array name="colorSchema__CourtCare" translatable="false">
         <item>|name                  |Color1 |Color2 |Color3 |Color9 |</item>
         <item>|Court Care Black Light|#000001|#ff0000|#dddddd|#FFFFFF|</item>
         <item>|Court Care White Dark |#FFFFFF|#ff0000|#dddddd|#000001|</item>
         <item>|Court Care Red Light  |#ff0000|#000001|#dddddd|#FFFFFF|</item>
         <item>|Court Care Red Dark   |#ff0000|#FFFFFF|#dddddd|#000001|</item>
     </string-array>
+-->
     <!-- green|gold|dark grey ... University of Notthingham -->
+<!--
     <string-array name="colorSchema__UoN" translatable="false">
         <item>|name                  |Color1 |Color2 |Color3 |Color9 |</item>
         <item>|UoN Green Light       |#005f36|#deb408|#4f4f4f|#FFFFFF|</item>
         <item>|UoN Green Dark        |#005f36|#deb408|#4f4f4f|#000001|</item>
         <item>|UoN Gold  Light       |#deb408|#005f36|#4f4f4f|#FFFFFF|</item>
         <item>|UoN Gold  Dark        |#deb408|#005f36|#4f4f4f|#000001|</item>
     </string-array>
-    <string-array name="colorSchema" translatable="false">
+-->
+    <string-array name="colorSchema__Squash" translatable="false">
                                <!-- scorebtn|name+sht|serveside|backgrn -->
         <item>|name                  |Color1 |Color2 |Color3 |Color9 |</item>
         <item>|PSA                   |#141414|#4CA3D9|#D3D3D3|#FFFFFF|</item><!-- dark|blue|light grey ... -->

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -88,8 +88,8 @@
                         android:key="colorSchema"
                         android:title="@string/pref_ColorPalette"
                         android:summary="@string/pref_ColorPalette_summary"
-                        android:entries="@array/colorSchema"
-                        android:entryValues="@array/colorSchema"
+                        android:entries="@array/colorSchema__Squash"
+                        android:entryValues="@array/colorSchema__Squash"
                         android:defaultValue="0"
                         />
             </PreferenceCategory>
@@ -890,8 +890,8 @@
                 android:key="useCastScreen"
                 android:title="@string/pref_useCastScreen"
                 android:summary="@string/pref_useCastScreen_summary"
-                android:entries="@array/colorSchema"
-                android:entryValues="@array/colorSchema"
+                android:entries="@array/colorSchema_new"
+                android:entryValues="@array/colorSchema_new"
                 android:defaultValue="0"
                 />
 <!--

diff --git a/src/com/doubleyellow/scoreboard/Brand.java b/src/com/doubleyellow/scoreboard/Brand.java
@@ -46,7 +46,7 @@
 
 public enum Brand
 {
-    Squore          (SportType.Squash     , R.string.app_name_short_brand__Squash          , 0, 0/*R.drawable.brand_squore*/    , R.id.sb_branded_logo_ar150, R.color.brand_squore_bg_color          , R.string.CUSTOM_RECEIVER_APP_ID_squore_fancy          , R.array.colorSchema                                                        , 3000, "https://squore.double-yellow.be"   , "8da78f9d-f7dd-437c-8b7d-d5bc231f92ec", R.raw.changelog),
+    Squore          (SportType.Squash     , R.string.app_name_short_brand__Squash          , 0, 0/*R.drawable.brand_squore*/    , R.id.sb_branded_logo_ar150, R.color.brand_squore_bg_color          , R.string.CUSTOM_RECEIVER_APP_ID_squore_fancy          , R.array.colorSchema__Squash                                             , 3000, "https://squore.double-yellow.be"   , "8da78f9d-f7dd-437c-8b7d-d5bc231f92ec", R.raw.changelog),
   //Tabletennis     (SportType.Tabletennis, R.string.app_name_short_brand__Tabletennis     , 0, 0/*R.drawable.brand_squore*/            , R.id.sb_branded_logo_ar150, R.color.brand_tabletennis_bg_color     , R.string.CUSTOM_RECEIVER_APP_ID_tabletennis_fancy         , R.array.colorSchema__Tabletennis                                            , 3000, "https://tabletennis.double-yellow.be", "e35d8fcb-a7c0-4c2a-9c74-cc3f6e1e6a41", R.raw.changelog_tabletennis),
   //Badminton       (SportType.Badminton  , R.string.app_name_short_brand__Badminton       , 0, 0/*R.drawable.brand_squore*/            , R.id.sb_branded_logo_ar150, R.color.brand_badminton_bg_color       , R.string.CUSTOM_RECEIVER_APP_ID_badminton_fancy         , R.array.colorSchema__Badminton                                              , 3000, "https://badminton.double-yellow.be", "18be497c-ddfa-4851-9b43-0a5866605252", R.raw.changelog_badminton),
   //Racketlon       (SportType.Racketlon  , R.string.app_name_short_brand__Racketlon       , 0, 0/*R.drawable.brand_squore*/              , R.id.sb_branded_logo_ar150, R.color.brand_racketlon_bg_color       , R.string.CUSTOM_RECEIVER_APP_ID_racketlon_fancy       , R.array.colorSchema__Racketlon                                              , 3000, "https://racketlon.double-yellow.be", "6ffc7128-6fd5-46d1-b79c-46e4c613cba5", R.raw.changelog_racketlon),

diff --git a/src/com/doubleyellow/scoreboard/main/ScoreBoard.java b/src/com/doubleyellow/scoreboard/main/ScoreBoard.java
@@ -4788,15 +4788,17 @@ private boolean _showTieBreakDialog(AnnouncementTrigger trigger, int iOccurrence
 
         if ( requestCode_MenuId == R.id.sb_settings ) {
             // returning from settings
-            List<String> lColorSettingChanged = Preferences.getChangedColorSettings();
-            if ( ListUtil.isNotEmpty(lColorSettingChanged) ) {
-                if ( PreferenceValues.wearable_syncColorPrefs( this ) ) {
-                    handleMenuItem(R.id.send_settings_to_wearable, lColorSettingChanged);
+            if ( m_wearableHelper != null ) {
+                List<String> lColorSettingChanged = Preferences.getChangedColorSettings();
+                if ( ListUtil.isNotEmpty(lColorSettingChanged) ) {
+                    if ( PreferenceValues.wearable_syncColorPrefs( this ) ) {
+                        handleMenuItem(R.id.send_settings_to_wearable, lColorSettingChanged);
+                    }
+                }
+                List<String> lWearableSettingChanged = Preferences.getWearableSettingsChanged();
+                if ( ListUtil.isNotEmpty(lWearableSettingChanged) ) {
+                    handleMenuItem(R.id.send_settings_to_wearable, lWearableSettingChanged);
                 }
-            }
-            List<String> lWearableSettingChanged = Preferences.getWearableSettingsChanged();
-            if ( ListUtil.isNotEmpty(lWearableSettingChanged) ) {
-                handleMenuItem(R.id.send_settings_to_wearable, lWearableSettingChanged);
             }
         }