Merge pull request #946 from gerhardol/feature/play-console-feedback

Play console feedback, various bundled changes
jonasoreland · Jul 26, 2020 · d83c5fa · d83c5fa
2 parents 3269b02 + 7bb2845
commit d83c5fa
Show file tree

Hide file tree

Showing 66 changed files with 665 additions and 482 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,9 @@ local.properties
 build/
 gen/
 
+#app bundle files
+*.aab
+
 # Intellij files (Android Studio)
 *.iml
 

diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,6 @@ notifications:
   email: false
 script:
 - ./gradlew wear:lintRelease
-- ./gradlew assembleLatestRelease
-- ./gradlew lintLatestRelease
-- ./gradlew test
+- ./gradlew app:lintLatestRelease
+- ./gradlew app:assembleLatestRelease
+- ./gradlew app:test
diff --git a/README.md b/README.md
@@ -22,11 +22,9 @@ Track your sport activities with RunnerUp using the GPS in your Android phone.
 
 ## Release
 
-* [Play Store](https://play.google.com/store/apps/details?id=org.runnerup).
-* [GitHub](https://github.com/jonasoreland/runnerup/releases). (RunnerUp 2.x versions including beta and release candidates.)
-* [F-Droid](https://f-droid.org/packages/org.runnerup.free/). This version does not contain some features due to licensing, see the F-Droid description.
-
-Join the beta program in Play for release candidates or monitor releases on GitHub.
+* [Play Store](https://play.google.com/store/apps/details?id=org.runnerup) Join [beta group](https://play.google.com/apps/testing/org.runnerup) for early access.
+* [GitHub](https://github.com/jonasoreland/runnerup/releases) All releases, including alpha releases.
+* [F-Droid](https://f-droid.org/packages/org.runnerup.free/) This version does not contain some features due to licensing, see the F-Droid description.
 
 The current 2.x release support Android 4.0 and later. The Play release also supports Android 2.2, 2.3, but due to lack of test devices, RunnerUp cannot support Android 2.x. The "Froyo" version do not include graphs, maps and elevation GeoId correction.
 

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -25,7 +25,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>

diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,13 +5,29 @@
   </head>
   <body>
     <h1>What's new</h1>
+    <h2>v2.1.0.0</h2>
+    <p>
+    <ul>
+      <li>Minor version number changed to 2.1 to prepare for Play release, previous production is 2.0.2.1</li>
+      <li>#946 Play console feedback
+        <ul>
+          <li>Translations update: Czech cue, Romanian, Indonesian </li>
+          <li>Accessibility: Increase size of touch targets for most targets with smaller areas</li>
+          <li>Accessibility: Set content descriptions, for visually disabled users</li>
+          <li>Revert from R8 to Proguard to avoid some 4.3 crashes, improved debugging of crashes</li>
+          <li>Decrease app size</li>
+          <li>Fix a few rare crashes</li>
+          <li>See Git log for further details</li>
+        </ul>
+      </li>
+    </ul>
     <h2>v2.0.6.4</h2>
     <p>
     <ul>
       <li>#938 Add time info to the exported filename</li>
       <li>#939 #937 Chinese support</li>
       <li>#936 Disable Dropbox provider by default</li>
-      <li>#934 Audio cues for r</li>
+      <li>#934 Audio cues for ro</li>
     </ul>
     <h2>v2.0.6.3</h2>
     <p>

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src/main']
-            if (rootProject.ext.allowNonFree) {
+            if (rootProject.ext.enableWear) {
                 java.srcDirs += ['src/play']
             } else {
                 java.srcDirs += ['src/free']
@@ -48,7 +48,7 @@ android {
             compileSdkVersion rootProject.ext.compileSdkVersion
             targetSdkVersion rootProject.ext.targetSdkVersion
             versionName rootProject.ext.versionName
-            versionCode 14000000 + rootProject.ext.versionCode
+            versionCode rootProject.ext.latestBaseVersionCode + rootProject.ext.versionCode
         }
     }
 
@@ -69,7 +69,7 @@ android {
         applicationId = rootProject.ext.applicationId
         vectorDrawables.useSupportLibrary = true
         //By default all AppCompat translations are included, saves 350KB
-        resConfigs "ar", "bs", "cs", "ca", "de", "en", "es", "fa", "fi", "fr", "hu", "id", "it", "ja", "lt", "nb", "nl", "pl", "pt", "ru", "sv", "tr", "zh"
+        resConfigs "ar", "bs", "cs", "ca", "de", "en", "es", "fa", "fi", "fr", "hu", "id", "in", "it", "ja", "lt", "nb", "nl", "pl", "pt", "ro", "ru", "sv", "tr", "zh"
     }
 
     signingConfigs {
@@ -117,19 +117,21 @@ repositories {
 dependencies {
     implementation project(':common')
     implementation project(':hrdevice')
-    if (rootProject.ext.allowNonFree) {
+    if (rootProject.ext.enableWear) {
         latestWearApp project(':wear')
     }
 
     //noinspection GradleCompatible
     latestImplementation "com.android.support:design:${rootProject.ext.supportLibrary}"
     latestImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibrary}"
-    //noinspection GradleDependency
-    latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"
+    if (rootProject.ext.enableWear) {
+        //noinspection GradleDependency
+        latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"
+    }
     latestImplementation 'com.getpebble:pebblekit:4.0.1'
     // MapBox uses telemetry, without Play there may be exceptions from mapbox: just ignore
     //latestImplementation "com.google.android.gms:play-services-location:${rootProject.ext.googlePlayServicesVersion}"
-    latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.2.1'
+    latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.2.2'
     latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0'
     latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v8:0.2.0'
     latestImplementation 'com.jjoe64:graphview:4.2.2'
@@ -208,8 +210,8 @@ android.applicationVariants.all {
 //Based on an example from https://developer.android.com/studio/build/configure-apk-splits.html
 //Most comments from there removed
 
-// Map for the version code that gives each ABI a value.
-ext.abiCodes = ['arm64-v8a': 1, 'armeabi':2, 'armeabi-v7a':3, 'mips':4, 'mips64':5, 'x86':6, 'x86_64':7]
+// Map for the version code that gives each ABI a value (generic has lower value)
+ext.abiCodes = ['arm64-v8a': 8, 'armeabi':2, 'armeabi-v7a':3, 'mips':4, 'mips64':5, 'x86':6, 'x86_64':7]
 
 import com.android.build.OutputFile
 

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
@@ -1,11 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.5.0-beta05" client="gradle" variant="latestRelease" version="3.5.0-beta05">
+<issues format="5" by="lint 4.0.1" client="gradle" variant="all" version="4.0.1">
 
     <issue
-        id="GradleCompatible"
-        message="All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 28.0.0, 27.1.1. Examples include `com.android.support:animated-vector-drawable:28.0.0` and `com.android.support:support-media-compat:27.1.1`">
+        id="UnusedAttribute"
+        message="Attribute `importantForAccessibility` is only used in API level 16 and higher (current min is 15)"
+        errorLine1="    android:importantForAccessibility=&quot;no&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="build.gradle"/>
+            file="res\layout\bottom_tab_indicator.xml"
+            line="4"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="UnusedAttribute"
+        message="Attribute `importantForAccessibility` is only used in API level 16 and higher (current min is 15)"
+        errorLine1="            android:importantForAccessibility=&quot;no&quot;"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res\layout\hr_settings.xml"
+            line="98"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedAttribute"
+        message="Attribute `importantForAccessibility` is only used in API level 16 and higher (current min is 15)"
+        errorLine1="                android:importantForAccessibility=&quot;no&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res\layout\userpass.xml"
+            line="45"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="UnusedAttribute"
+        message="Attribute `importantForAccessibility` is only used in API level 16 and higher (current min is 15)"
+        errorLine1="                android:importantForAccessibility=&quot;no&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res\layout\userpass.xml"
+            line="70"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="UnusedAttribute"
+        message="Attribute `importantForAccessibility` is only used in API level 16 and higher (current min is 15)"
+        errorLine1="                android:importantForAccessibility=&quot;no&quot;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res\layout\userpass.xml"
+            line="96"
+            column="17"/>
     </issue>
 
     <issue

diff --git a/app/listings/README.md b/app/listings/README.md
@@ -0,0 +1 @@
+play/ contains the Play store listing in Gradle Play Publisher (GPP, previously called Triple-T) format.
diff --git a/app/src/main/play/contact-email.txt → app/listings/play/contact-email.txt b/app/src/main/play/contact-email.txt → app/listings/play/contact-email.txt
diff --git a/app/src/main/play/default-language.txt → app/listings/play/default-language.txt b/app/src/main/play/default-language.txt → app/listings/play/default-language.txt
diff --git a/.../play/listings/en-US/default-language.txt → .../play/listings/en-US/default-language.txt b/.../play/listings/en-US/default-language.txt → .../play/listings/en-US/default-language.txt
diff --git a/.../play/listings/en-US/full-description.txt → .../play/listings/en-US/full-description.txt b/.../play/listings/en-US/full-description.txt → .../play/listings/en-US/full-description.txt
diff --git a/...tings/en-US/graphics/icon/ic_launcher.png → ...tings/en-US/graphics/icon/ic_launcher.png b/...tings/en-US/graphics/icon/ic_launcher.png → ...tings/en-US/graphics/icon/ic_launcher.png
diff --git a/...US/graphics/phone-screenshots/1_start.png → ...US/graphics/phone-screenshots/1_start.png b/...US/graphics/phone-screenshots/1_start.png → ...US/graphics/phone-screenshots/1_start.png
diff --git a/...hone-screenshots/2_recording_advanced.png → ...hone-screenshots/2_recording_advanced.png b/...hone-screenshots/2_recording_advanced.png → ...hone-screenshots/2_recording_advanced.png
diff --git a/.../graphics/phone-screenshots/3_history.png → .../graphics/phone-screenshots/3_history.png b/.../graphics/phone-screenshots/3_history.png → .../graphics/phone-screenshots/3_history.png
diff --git a/...ne-screenshots/4_detail_laps_advanced.png → ...ne-screenshots/4_detail_laps_advanced.png b/...ne-screenshots/4_detail_laps_advanced.png → ...ne-screenshots/4_detail_laps_advanced.png
diff --git a/...aphics/phone-screenshots/5_detail_map.png → ...aphics/phone-screenshots/5_detail_map.png b/...aphics/phone-screenshots/5_detail_map.png → ...aphics/phone-screenshots/5_detail_map.png
diff --git a/...graphics/phone-screenshots/6_accounts.png → ...graphics/phone-screenshots/6_accounts.png b/...graphics/phone-screenshots/6_accounts.png → ...graphics/phone-screenshots/6_accounts.png
diff --git a/...cs/phone-screenshots/7_start_advanced.png → ...cs/phone-screenshots/7_start_advanced.png b/...cs/phone-screenshots/7_start_advanced.png → ...cs/phone-screenshots/7_start_advanced.png
diff --git a/...s/phone-screenshots/8_start_intervall.png → ...s/phone-screenshots/8_start_intervall.png b/...s/phone-screenshots/8_start_intervall.png → ...s/phone-screenshots/8_start_intervall.png
diff --git a/app/listings/play/listings/en-US/short-description.txt b/app/listings/play/listings/en-US/short-description.txt
@@ -0,0 +1 @@
+RunnerUp - an open source GPS tracker with advanced workout and audio cues.
diff --git a/app/src/main/play/listings/en-US/title.txt → app/listings/play/listings/en-US/title.txt b/app/src/main/play/listings/en-US/title.txt → app/listings/play/listings/en-US/title.txt
diff --git a/app/src/main/play/privacy.html → app/listings/play/privacy.html b/app/src/main/play/privacy.html → app/listings/play/privacy.html
diff --git a/...n/play/release-notes/en-US/production.txt → ...s/play/release-notes/en-US/production.txt b/...n/play/release-notes/en-US/production.txt → ...s/play/release-notes/en-US/production.txt
diff --git a/app/proguard.txt b/app/proguard.txt
@@ -3,17 +3,23 @@
 ############################
 # RunnerUp internal
 
+# will keep line numbers and file name obfuscation
+-renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable
+-keepattributes EnclosingMethod
+
 # All implementations of internal interfaces do not use all methods
-#-dontnote org.runnerup.view.StepButton
-#-dontnote org.runnerup.widget.ClassicSpinner
-#-dontnote org.runnerup.widget.TitleSpinner
+# org.runnerup.view.StepButton.**
+# org.runnerup.widget.ClassicSpinner.**
+# org.runnerup.widget.TitleSpinner.**
+-keep,includedescriptorclasses class org.runnerup.**
 
 #PlayServices related?
 -dontnote com.google.protobuf.zz*
 -dontnote com.google.android.gms.dynamic.IObjectWrapper
 
 #AntPlus is optional - used by reflection
--keep class org.runnerup.hr.AntPlus {
+-keep,includedescriptorclasses class org.runnerup.hr.AntPlus {
   *;
 }
 -keepclassmembers class org.runnerup.hr.AntPlus {
@@ -23,16 +29,21 @@
 ############################
 # ANTplus
 
-#ref to fit
 -keep class com.dsi.ant.plugins.**
-#-dontwarn com.dsi.ant.**
 -keeppackagenames com.dsi.ant.**
 
+#ref to com.garmin.fit
+-dontwarn com.dsi.ant.**
+
 ############################
 # GraphView
 
 -dontnote com.jjoe64.graphview.LegendRenderer
 
+############################
+# other, unknown
+-dontnote Object
+
 ############################
 # Other mapbox
 
@@ -43,6 +54,9 @@
 -dontnote okio.BufferedSink
 
 #############################
+# Keep descriptor class
+-keep class com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.MapboxGLSurfaceView$OnGLSurfaceViewDetachedListener
+
 # From mapbox demo https://github.com/mapbox/mapbox-android-demo/blob/master/MapboxAndroidDemo/proguard-rules.pro
 
 # Retrofit 2

diff --git a/app/res/drawable-v21/ic_tab_feed_24dp.xml b/app/res/drawable-v21/ic_tab_feed_24dp.xml
@@ -1,4 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:importantForAccessibility="no"
     android:width="24dp"
     android:height="24dp"
     android:tint="@color/bottom_tabs"

diff --git a/app/res/layout/account.xml b/app/res/layout/account.xml
@@ -37,12 +37,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:scaleType="center" />
 
         <ImageView
             android:id="@+id/account_list_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:scaleType="center"
             tools:ignore="ContentDescription"/>
     </LinearLayout>
@@ -68,6 +72,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/account_upload_button"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:text="@string/Disconnect" />
 
     <Button
@@ -77,25 +83,31 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/account_download_button"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:text="@string/upload" />
 
   <Button
-    style="@style/ButtonText"
-    android:id="@+id/account_download_button"
-    android:background="@drawable/btn_blue"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="false"
-    android:text="@string/Download"
-    android:layout_above="@+id/ok_account_button"/>
+      style="@style/ButtonText"
+      android:id="@+id/account_download_button"
+      android:background="@drawable/btn_blue"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="false"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
+      android:text="@string/Download"
+      android:layout_above="@+id/ok_account_button" />
 
   <Button
-        android:id="@+id/ok_account_button"
-        style="@style/ButtonText"
-        android:background="@drawable/btn_green"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:text="@string/OK" />
+      android:id="@+id/ok_account_button"
+      style="@style/ButtonText"
+      android:background="@drawable/btn_green"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
+      android:text="@string/OK" />
 
 </RelativeLayout>
diff --git a/app/res/layout/account_row.xml b/app/res/layout/account_row.xml
@@ -66,14 +66,18 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:minWidth="48dp"
+            android:minHeight="48dp" />
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/account_list_feed"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:contentDescription="@string/feed" />
 
         <android.support.v7.widget.SwitchCompat
@@ -82,6 +86,8 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:contentDescription="@string/upload" />
 
     </LinearLayout>

diff --git a/app/res/layout/bottom_tab_indicator.xml b/app/res/layout/bottom_tab_indicator.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:importantForAccessibility="no"
     android:layout_width="0dp"
     android:layout_height="56dp"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_weight="1"
     android:orientation="vertical"
     android:paddingLeft="12dp"

diff --git a/app/res/layout/filepermission.xml b/app/res/layout/filepermission.xml
@@ -49,6 +49,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:hint="URL"
             android:inputType="textUri"
             tools:ignore="HardcodedText,AutoFill"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,9 @@ local.properties @@
     build/
     gen/
+    #app bundle files
+    *.aab
     # Intellij files (Android Studio)
     *.iml
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		play/ contains the Play store listing in Gradle Play Publisher (GPP, previously called Triple-T) format.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		RunnerUp - an open source GPS tracker with advanced workout and audio cues.