Merge pull request #813 from gerhardol/feature/froyo-api24

Froyo separate fork
jonasoreland · Jul 18, 2019 · c06aa0c · c06aa0c
2 parents b55d01b + 383c199
commit c06aa0c
Show file tree

Hide file tree

Showing 63 changed files with 88 additions and 7,394 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
   global:
-  - ANDROID_API=28
+  - ANDROID_API=24
   - ANDROID_BUILD_TOOLS=29.0.1
   - ADB_INSTALL_TIMEOUT=5
 language: android
@@ -24,13 +24,9 @@ android:
   - build-tools-$ANDROID_BUILD_TOOLS
   - android-$ANDROID_API
   - extra-android-m2repository
-  - extra-google-m2repository
-  - extra-google-google_play_services
 notifications:
   email: false
 script:
-- ./gradlew wear:lintRelease
-- ./gradlew assembleLatestRelease
-- ./gradlew lintLatestRelease
-- ./gradlew assembleFroyoRelease lintFroyoRelease
+- ./gradlew lintFroyoRelease
+- ./gradlew assembleFroyoRelease
 - ./gradlew test
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -44,7 +44,6 @@
 
     <application
         android:allowBackup="true"
-        android:appCategory="maps"
         android:extractNativeLibs="false"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
@@ -125,12 +124,12 @@
         <activity
             android:name=".view.ManualActivity"
             android:label="@string/Manual_activity_title"
-            android:parentActivityName=".view.MainLayout"
+            android:parentActivityName=".view.HistoryActivity"
             android:theme="@style/AppTheme">
             <!-- Parent activity meta-data to support 4.0 and lower -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".view.MainLayout"/>
+                android:value=".view.HistoryActivity"/>
         </activity>
 
         <activity

diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,6 +5,11 @@
 </head>
 <body>
 <h1>What's new</h1>
+<h2>v2.0.0.9-Froyo</h2>
+<p>
+<ul>
+    <li>Froyo separate fork, removed "latest" flavor. Set TargetAPI to 24.</li>
+</ul>
 <h2>v2.0.0.8</h2>
 <p>
 <ul>

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,27 +28,13 @@ android {
 
         froyo {
             manifest.srcFile 'froyo/AndroidManifest.xml'
-            java.srcDirs = ['froyo/java']
-        }
-        latest {
-            manifest.srcFile 'latest/AndroidManifest.xml'
-            java.srcDirs = ['latest/java']
-            res.srcDirs = ['latest/res']
-            assets.srcDirs = ['latest/assets']
+            java.srcDirs = ['froyo/java','free/java']
         }
         test.setRoot('test')
     }
 
     flavorDimensions "all"
     productFlavors {
-        latest {
-            dimension "all"
-            minSdkVersion 15
-            compileSdkVersion rootProject.ext.compileSdkVersion
-            targetSdkVersion rootProject.ext.targetSdkVersion
-            versionName rootProject.ext.versionName
-            versionCode 14000000 + rootProject.ext.versionCode
-        }
         froyo {
             dimension "all"
             minSdkVersion 8
@@ -73,6 +59,14 @@ android {
         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"
+
+        if (rootProject.ext.allowNonFree) {
+            applicationIdSuffix ""
+        } else {
+            // Separate applicationId for the free version
+            applicationIdSuffix ".free"
+            versionNameSuffix "-free"
+        }
     }
 
     signingConfigs {
@@ -83,19 +77,20 @@ android {
 
     buildTypes {
         debug {
-            // Set the applicationId separate for the debug build so it can be installed separately
+            // Set a separate applicationId for the debug build so it can be installed with release builds
             // The applicationId is also used in some xml files (android:targetPackage)
             // The packageId (in the manifest) is never changed
             applicationIdSuffix ".debug"
-            resValue "string", "applicationIdFull", "org.runnerup${applicationIdSuffix}"
-            versionNameSuffix '-debug'
+            resValue "string", "applicationIdFull", "${defaultConfig.applicationId}${defaultConfig.applicationIdSuffix}${applicationIdSuffix}"
+            versionNameSuffix "-debug"
         }
         release {
-            minifyEnabled true
-            shrinkResources true
+            applicationIdSuffix ""
+            minifyEnabled rootProject.ext.allowNonFree
+            shrinkResources rootProject.ext.allowNonFree
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.txt'
             signingConfig signingConfigs.release
-            resValue "string", "applicationIdFull", "org.runnerup"
+            resValue "string", "applicationIdFull", "${defaultConfig.applicationId}${defaultConfig.applicationIdSuffix}"
         }
     }
 
@@ -122,18 +117,8 @@ repositories {
 dependencies {
     implementation project(':common')
     implementation project(':hrdevice')
-    latestWearApp project(':wear')
-
-    latestImplementation "com.android.support:design:${rootProject.ext.supportLibrary}"
-    //Lint bug: https://issuetracker.google.com/issues/231321
-    //noinspection GradleDependency
     froyoImplementation 'com.android.support:design:24.1.0' //SDK <10 dropped in 24.2
 
-    latestImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibrary}"
-    latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"
-    latestImplementation 'com.getpebble:pebblekit:4.0.1'
-    latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.8.1'
-    latestImplementation 'com.jjoe64:graphview:4.2.2'
     froyoImplementation 'com.jjoe64:graphview:4.2.1'
 
     testImplementation "junit:junit:${rootProject.ext.junitVersion}"
@@ -168,7 +153,7 @@ android.applicationVariants.all {
         buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', props.mapboxAccessToken
     }
     else {
-        // Demo key
+        // Invalid token, no map
         buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', '"pk.eyJ1IjoiY3FucXJkIiwiYSI6ImJmYjcxNDkyZjJiNzllMzYxYjA0NjA1YTI0Mzg4ODA4In0.N9lbcSp06JqIpFSP5X44Fw"'
     }
 

diff --git a/...nnerup/tracker/component/TrackerWear.java → ...nnerup/tracker/component/TrackerWear.java b/...nnerup/tracker/component/TrackerWear.java → ...nnerup/tracker/component/TrackerWear.java
diff --git a/app/free/java/org/runnerup/util/GoogleApiHelper.java b/app/free/java/org/runnerup/util/GoogleApiHelper.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2012 - 2013 [email protected]
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.runnerup.util;
+
+import android.content.Context;
+
+public class GoogleApiHelper {
+    public static boolean isGooglePlayServicesAvailable(Context context) {
+        return false;
+    }
+}
diff --git a/app/froyo/java/org/runnerup/widget/AboutPreference.java b/app/froyo/java/org/runnerup/widget/AboutPreference.java
diff --git a/app/latest/AndroidManifest.xml b/app/latest/AndroidManifest.xml
diff --git a/app/latest/assets/egm96-delta.dat b/app/latest/assets/egm96-delta.dat
diff --git a/app/latest/java/org/matthiaszimmermann/location/Location.java b/app/latest/java/org/matthiaszimmermann/location/Location.java