From 15e2463eff8d05361ae7e31cef1074097915632b Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 13:30:05 +0200 Subject: [PATCH 01/16] AS 4.0.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 430dd6a3a..f9d51dc2a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.0.1' } } From 1ac54db7db55980409289ed3e4fa9079fed7f0a7 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 13:30:41 +0200 Subject: [PATCH 02/16] Refresh Play description --- README.md | 8 +++----- app/src/main/play/listings/en-US/short-description.txt | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bbded4ba6..a0da8d8a7 100644 --- 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/src/main/play/listings/en-US/short-description.txt b/app/src/main/play/listings/en-US/short-description.txt index 6024a5c96..0b3f9036e 100644 --- a/app/src/main/play/listings/en-US/short-description.txt +++ b/app/src/main/play/listings/en-US/short-description.txt @@ -1,2 +1 @@ -RunnerUp, an open source run tracker with advanced workout and audio cues. -Track your running with RunnerUp using the GPS in your Android phone. \ No newline at end of file +RunnerUp - an open source GPS tracker with advanced workout and audio cues. \ No newline at end of file From cd98d7183c10b95b515541c6f4d913e073cbb6f4 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Sun, 26 Jul 2020 09:45:27 +0200 Subject: [PATCH 03/16] Move GPP/Triple-T files from source The Play listing is included in Google Play Publisher (GPP, previously called Triple-T) format in the source repo. These files are included in the .apk too, but files are not used when publishing. The files are moved to not be included in the device .apk. --- app/listings/README.md | 1 + app/{src/main => listings}/play/contact-email.txt | 0 .../main => listings}/play/default-language.txt | 0 .../play/listings/en-US/default-language.txt | 0 .../play/listings/en-US/full-description.txt | 0 .../listings/en-US/graphics/icon/ic_launcher.png | Bin .../en-US/graphics/phone-screenshots/1_start.png | Bin .../phone-screenshots/2_recording_advanced.png | Bin .../en-US/graphics/phone-screenshots/3_history.png | Bin .../phone-screenshots/4_detail_laps_advanced.png | Bin .../graphics/phone-screenshots/5_detail_map.png | Bin .../en-US/graphics/phone-screenshots/6_accounts.png | Bin .../graphics/phone-screenshots/7_start_advanced.png | Bin .../phone-screenshots/8_start_intervall.png | Bin .../play/listings/en-US/short-description.txt | 0 .../main => listings}/play/listings/en-US/title.txt | 0 app/{src/main => listings}/play/privacy.html | 0 .../play/release-notes/en-US/production.txt | 0 18 files changed, 1 insertion(+) create mode 100644 app/listings/README.md rename app/{src/main => listings}/play/contact-email.txt (100%) rename app/{src/main => listings}/play/default-language.txt (100%) rename app/{src/main => listings}/play/listings/en-US/default-language.txt (100%) rename app/{src/main => listings}/play/listings/en-US/full-description.txt (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/icon/ic_launcher.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/1_start.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/2_recording_advanced.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/3_history.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/4_detail_laps_advanced.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/5_detail_map.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/6_accounts.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/7_start_advanced.png (100%) rename app/{src/main => listings}/play/listings/en-US/graphics/phone-screenshots/8_start_intervall.png (100%) rename app/{src/main => listings}/play/listings/en-US/short-description.txt (100%) rename app/{src/main => listings}/play/listings/en-US/title.txt (100%) rename app/{src/main => listings}/play/privacy.html (100%) rename app/{src/main => listings}/play/release-notes/en-US/production.txt (100%) diff --git a/app/listings/README.md b/app/listings/README.md new file mode 100644 index 000000000..b17cd128d --- /dev/null +++ b/app/listings/README.md @@ -0,0 +1 @@ +play/ contains the Play store listing in Gradle Play Publisher (GPP, previously called Triple-T) format. \ No newline at end of file diff --git a/app/src/main/play/contact-email.txt b/app/listings/play/contact-email.txt similarity index 100% rename from app/src/main/play/contact-email.txt rename to app/listings/play/contact-email.txt diff --git a/app/src/main/play/default-language.txt b/app/listings/play/default-language.txt similarity index 100% rename from app/src/main/play/default-language.txt rename to app/listings/play/default-language.txt diff --git a/app/src/main/play/listings/en-US/default-language.txt b/app/listings/play/listings/en-US/default-language.txt similarity index 100% rename from app/src/main/play/listings/en-US/default-language.txt rename to app/listings/play/listings/en-US/default-language.txt diff --git a/app/src/main/play/listings/en-US/full-description.txt b/app/listings/play/listings/en-US/full-description.txt similarity index 100% rename from app/src/main/play/listings/en-US/full-description.txt rename to app/listings/play/listings/en-US/full-description.txt diff --git a/app/src/main/play/listings/en-US/graphics/icon/ic_launcher.png b/app/listings/play/listings/en-US/graphics/icon/ic_launcher.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/icon/ic_launcher.png rename to app/listings/play/listings/en-US/graphics/icon/ic_launcher.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/1_start.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/1_start.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/1_start.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/1_start.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/2_recording_advanced.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/2_recording_advanced.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/2_recording_advanced.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/2_recording_advanced.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/3_history.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/3_history.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/3_history.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/3_history.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/4_detail_laps_advanced.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/4_detail_laps_advanced.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/4_detail_laps_advanced.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/4_detail_laps_advanced.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/5_detail_map.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/5_detail_map.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/5_detail_map.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/5_detail_map.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/6_accounts.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/6_accounts.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/6_accounts.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/6_accounts.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/7_start_advanced.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/7_start_advanced.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/7_start_advanced.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/7_start_advanced.png diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/8_start_intervall.png b/app/listings/play/listings/en-US/graphics/phone-screenshots/8_start_intervall.png similarity index 100% rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/8_start_intervall.png rename to app/listings/play/listings/en-US/graphics/phone-screenshots/8_start_intervall.png diff --git a/app/src/main/play/listings/en-US/short-description.txt b/app/listings/play/listings/en-US/short-description.txt similarity index 100% rename from app/src/main/play/listings/en-US/short-description.txt rename to app/listings/play/listings/en-US/short-description.txt diff --git a/app/src/main/play/listings/en-US/title.txt b/app/listings/play/listings/en-US/title.txt similarity index 100% rename from app/src/main/play/listings/en-US/title.txt rename to app/listings/play/listings/en-US/title.txt diff --git a/app/src/main/play/privacy.html b/app/listings/play/privacy.html similarity index 100% rename from app/src/main/play/privacy.html rename to app/listings/play/privacy.html diff --git a/app/src/main/play/release-notes/en-US/production.txt b/app/listings/play/release-notes/en-US/production.txt similarity index 100% rename from app/src/main/play/release-notes/en-US/production.txt rename to app/listings/play/release-notes/en-US/production.txt From 56c21942bf4a0b570f5f29c99772251d638dc654 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 13:31:04 +0200 Subject: [PATCH 04/16] Remove unused permission ACCESS_LOCATION_EXTRA_COMMANDS --- app/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml index b5e991882..1485dd590 100644 --- a/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml @@ -25,7 +25,6 @@ - From 198832d5d298e8f6e78dc9eb49c3790cba1b4775 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 13:31:59 +0200 Subject: [PATCH 05/16] Prepare for App Bundle (.aab) --- .gitignore | 3 +++ app/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a1cda953..f2490d24e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ local.properties build/ gen/ +#app bundle files +*.aab + # Intellij files (Android Studio) *.iml diff --git a/app/build.gradle b/app/build.gradle index eab54d28b..5cb4a6058 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -208,8 +208,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 From 01b6510f451c7d047a4420266c0128383f264254 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 13:33:00 +0200 Subject: [PATCH 06/16] Revert use of R8 to avoid Android 4.3 crashes Update proguard configuration Update MapBox version --- app/build.gradle | 2 +- app/proguard.txt | 21 +++++++++++++++------ gradle.properties | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5cb4a6058..87b9b29e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -129,7 +129,7 @@ dependencies { 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' diff --git a/app/proguard.txt b/app/proguard.txt index 7dae9e6a2..c33c2b74c 100644 --- a/app/proguard.txt +++ b/app/proguard.txt @@ -4,16 +4,17 @@ # RunnerUp internal # 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 +24,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 +49,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/gradle.properties b/gradle.properties index e69de29bb..fffbac400 100644 --- a/gradle.properties +++ b/gradle.properties @@ -0,0 +1 @@ +android.enableR8=false \ No newline at end of file From def79714b78d874326183852766b6f81b4f86ccc Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Sat, 25 Jul 2020 02:28:16 +0200 Subject: [PATCH 07/16] ProGuard debugging --- app/proguard.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/proguard.txt b/app/proguard.txt index c33c2b74c..7bbd4fa11 100644 --- a/app/proguard.txt +++ b/app/proguard.txt @@ -3,6 +3,11 @@ ############################ # 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 # org.runnerup.view.StepButton.** # org.runnerup.widget.ClassicSpinner.** From fb9c3ae74a7cfdd1c5594375129c3eeec508091f Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Mon, 20 Jul 2020 22:31:39 +0200 Subject: [PATCH 08/16] WebDAV: Give hint for upload URL --- app/src/main/org/runnerup/export/SyncManager.java | 6 +++++- app/src/main/org/runnerup/export/WebDavSynchronizer.java | 8 ++++++-- app/src/main/org/runnerup/util/FileNameHelper.java | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/org/runnerup/export/SyncManager.java b/app/src/main/org/runnerup/export/SyncManager.java index 27cdc3221..3eb53eda2 100644 --- a/app/src/main/org/runnerup/export/SyncManager.java +++ b/app/src/main/org/runnerup/export/SyncManager.java @@ -394,7 +394,11 @@ public void onCheckedChanged(CompoundButton buttonView, } if (AuthMethod.USER_PASS_URL.equals(authMethod)) { rowUrl.setVisibility(View.VISIBLE); - urlInput.setText(authConfig.optString(DB.ACCOUNT.URL)); + String url = authConfig.optString(DB.ACCOUNT.URL); + if (url == null || url.isEmpty()) { + url = sync.getPublicUrl(); + } + urlInput.setText(url); } else { rowUrl.setVisibility(View.GONE); } diff --git a/app/src/main/org/runnerup/export/WebDavSynchronizer.java b/app/src/main/org/runnerup/export/WebDavSynchronizer.java index a7651e3ec..baa20db36 100644 --- a/app/src/main/org/runnerup/export/WebDavSynchronizer.java +++ b/app/src/main/org/runnerup/export/WebDavSynchronizer.java @@ -48,12 +48,11 @@ public class WebDavSynchronizer extends DefaultSynchronizer { - public static final String NAME = "WebDav"; + public static final String NAME = "WebDAV"; private long id = 0; private PathSimplifier simplifier; - private FileFormats format; private String username; private String password; private String url; @@ -80,6 +79,11 @@ public String getName() { @Override public String getPublicUrl() { + if (url == null || url.isEmpty()) { + // Some default to help formatting + // TODO Separate URL for upload and access + return "https://site.com/remote.php/dav/files/useremail/runnerup"; + } return url; } diff --git a/app/src/main/org/runnerup/util/FileNameHelper.java b/app/src/main/org/runnerup/util/FileNameHelper.java index 362c61f61..dbefa5481 100644 --- a/app/src/main/org/runnerup/util/FileNameHelper.java +++ b/app/src/main/org/runnerup/util/FileNameHelper.java @@ -42,10 +42,10 @@ public static String getExportFileName(long activityStartTime, String activityTy } /** - * Generate filename including the model name, to limit sorting in services like DropBox/WebDav + * Generate filename including the model name, to limit sorting in services like DropBox/WebDAV * @param activityStartTime activity start time in unix timestamp * @param activityType activity type - * @return the generated filename for DropBox/WebDav + * @return the generated filename for DropBox/WebDAV */ public static String getExportFileNameWithModel(long activityStartTime, String activityType) { return String.format(Locale.getDefault(), From f5991b77e3434db25dbcab3296c7b4d3f601a53c Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Thu, 23 Jul 2020 17:10:59 +0200 Subject: [PATCH 09/16] Translations update: Czech cue, Romanian, Indonesian * Czech cues were not selectable * Romanian excluded * Indonesian requires use of legacy 'in' --- app/build.gradle | 2 +- app/res/values/array.xml | 4 +++- common/src/main/res/values-tr/strings.xml | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 87b9b29e3..960527a04 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/res/values/array.xml b/app/res/values/array.xml index b485a3135..e9a559e33 100644 --- a/app/res/values/array.xml +++ b/app/res/values/array.xml @@ -42,6 +42,7 @@ العَرَبِيَّة‎‎ Bahasa Indonesia Català + Čeština Deutsch Español زبان فارسی @@ -65,8 +66,9 @@ en ar - id + in ca + cs de es fa diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml index 4b8bd6c7a..47fccfce3 100644 --- a/common/src/main/res/values-tr/strings.xml +++ b/common/src/main/res/values-tr/strings.xml @@ -24,7 +24,6 @@ - Tamam Tip toparlanma @@ -56,5 +55,4 @@ Yenile Yaş Tamam - Tamam From 4f812f1848efbcce782bf1ff6296175d4ce5edb2 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Tue, 21 Jul 2020 09:10:19 +0200 Subject: [PATCH 10/16] Change string Create -> OK --- app/src/main/org/runnerup/view/AudioCueSettingsActivity.java | 2 +- app/src/main/org/runnerup/view/ManageWorkoutsActivity.java | 2 +- common/src/main/res/values/strings.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/org/runnerup/view/AudioCueSettingsActivity.java b/app/src/main/org/runnerup/view/AudioCueSettingsActivity.java index ba746318e..5f62c0ec8 100644 --- a/app/src/main/org/runnerup/view/AudioCueSettingsActivity.java +++ b/app/src/main/org/runnerup/view/AudioCueSettingsActivity.java @@ -309,7 +309,7 @@ private void createNewAudioSchemeDialog() { .setTitle(getString(R.string.Create_new_audio_cue_scheme)) // Get the layout inflater .setView(editText) - .setPositiveButton(getString(R.string.Create), new OnClickListener() { + .setPositiveButton(getString(R.string.OK), new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { String scheme = editText.getText().toString(); diff --git a/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java b/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java index 109feb91b..4b4b719e8 100644 --- a/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java +++ b/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java @@ -234,7 +234,7 @@ public void onClick(DialogInterface dialog, int which) { launchMain(saveName); } }) - .setNegativeButton(getString(R.string.No_way), + .setNegativeButton(getString(R.string.No), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // Do nothing but close the dialog diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7a2d11db5..0d1fe85fe 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -151,7 +151,6 @@ Create new audio cue scheme Yes Create - No way No Loading Saving From d012653bba3930bdccbed6145c6c795d77391344 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Fri, 7 Feb 2020 22:37:23 +0100 Subject: [PATCH 11/16] Prepare disable Wear builds in rootProject.ext --- .travis.yml | 6 +++--- app/build.gradle | 12 +++++++----- build.gradle | 4 +++- wear/build.gradle | 3 +-- wear/lint-baseline.xml | 10 +++++----- wear/proguard.txt | 1 + wear/src/main/AndroidManifest.xml | 4 ---- wear/src/main/res/layout/activity_main.xml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 023f6964e..e71115664 100644 --- 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/app/build.gradle b/app/build.gradle index 960527a04..2c7ace29e 100644 --- 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 } } @@ -117,15 +117,17 @@ 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}" diff --git a/build.gradle b/build.gradle index f9d51dc2a..f3f740612 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,9 @@ project.ext { mockitoVersion = '2.3.7' //The tag for the release must be identical for F-Droid - versionName = '2.0.6.4' + versionName = '2.0.6.14' versionCode = 214 + latestBaseVersionCode = 14000000 travisBuild = System.getenv("TRAVIS") == "true" // allows for -Dpre-dex=false to be set @@ -39,6 +40,7 @@ project.ext { // F-Droid builds only allow free software (wear dir deleted at builds) allowNonFree = !project.hasProperty('org.runnerup.free') && rootProject.file("wear").exists() + enableWear = allowNonFree // Note: AntPlus may have to be downloaded explicitly due to licensing antPlusLib = "ANT-Android-SDKs/ANT+_Android_SDK/API/antpluginlib_3-8-0.aar" diff --git a/wear/build.gradle b/wear/build.gradle index 3e9dc309b..73bae494b 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' - android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion @@ -9,7 +8,7 @@ android { minSdkVersion 23 targetSdkVersion rootProject.ext.compileSdkVersion versionName rootProject.ext.versionName - versionCode rootProject.ext.versionCode + versionCode rootProject.ext.latestBaseVersionCode + rootProject.ext.versionCode } dexOptions { diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml index 177e58b3b..9cd5a767a 100644 --- a/wear/lint-baseline.xml +++ b/wear/lint-baseline.xml @@ -1,5 +1,5 @@ - + diff --git a/wear/proguard.txt b/wear/proguard.txt index 38814c6e9..60620f7a3 100644 --- a/wear/proguard.txt +++ b/wear/proguard.txt @@ -3,3 +3,4 @@ #PlayServices related? -dontnote com.google.protobuf.zz* -dontnote com.google.android.gms.dynamic.IObjectWrapper +-dontwarn com.google.android.wearable.** diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 54b2e61d9..0deb26aaf 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -30,10 +30,6 @@ android:supportsRtl="true" tools:ignore="AllowBackup,GoogleAppIndexingWarning"> - - Date: Mon, 20 Jul 2020 23:08:14 +0200 Subject: [PATCH 12/16] Accessibility: use 48dp Play Console pre-launch report --- app/res/layout/account.xml | 42 ++++++++++++------- app/res/layout/account_row.xml | 8 +++- app/res/layout/filepermission.xml | 2 + app/res/layout/heartratezonerow.xml | 4 ++ app/res/layout/heartratezones.xml | 6 +++ app/res/layout/manual.xml | 2 + app/res/layout/start.xml | 20 +++++---- app/res/layout/start_advanced.xml | 4 ++ app/res/layout/start_interval.xml | 4 ++ app/res/layout/step_button.xml | 2 + app/res/layout/step_dialog.xml | 18 ++++---- app/res/layout/title_spinner.xml | 2 + app/res/layout/userpass.xml | 6 +++ app/res/xml/settings.xml | 4 ++ .../org/runnerup/view/AccountActivity.java | 6 +++ .../view/AudioCueSettingsActivity.java | 3 ++ .../org/runnerup/widget/DistancePicker.java | 2 + .../org/runnerup/widget/DurationPicker.java | 6 +++ .../org/runnerup/widget/SpinnerPresenter.java | 2 + .../org/runnerup/widget/TextPreference.java | 9 ++-- 20 files changed, 115 insertions(+), 37 deletions(-) diff --git a/app/res/layout/account.xml b/app/res/layout/account.xml index 396623194..2a1b6dd3e 100644 --- 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" /> @@ -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" />