Update to v2.1.3

Add flavors for normal and play, which have the applicationIds of .chan and .clover

.gitignore

@@ -1,7 +1,6 @@
 gps/
 Clover/app/keys.properties
 Clover/app/version.properties
-Clover/app/src/main/res/values/private_strings.xml
 Clover/captures/
 
 

CHANGES.txt

@@ -1,3 +1,7 @@
+New in 2.1.3 (2016-01-28)
+- New Google Play release
+
+
 New in 2.1.2 (2016-01-17)
 - Fix for a crash on Android 4
 - Changed the top boards again

Clover/app/build.gradle

@@ -5,11 +5,12 @@ android {
     buildToolsVersion '23.0.2'
 
     defaultConfig {
+        applicationId "org.floens.chan"
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionName "v2.1.2"
-        versionCode 54
+        versionName "v2.1.3"
+        versionCode 55
     }
 
     compileOptions {
@@ -61,11 +62,6 @@ android {
             proguardFiles 'proguard.cfg'
         }
 
-        beta.initWith(buildTypes.release)
-        beta {
-            versionNameSuffix " Beta"
-        }
-
         debug {
             versionNameSuffix " Debug"
 //            minifyEnabled true
@@ -73,6 +69,21 @@ android {
         }
     }
 
+    productFlavors {
+        normal {
+            applicationId = "org.floens.chan"
+            // resValue "string", "app_name", "Clover F-Droid"
+            resValue "string", "app_name", "Clover"
+            resValue "string", "app_flavor_name", ""
+        }
+
+        play {
+            applicationId = "org.floens.clover"
+            resValue "string", "app_name", "Clover"
+            resValue "string", "app_flavor_name", "Google Play"
+        }
+    }
+
     sourceSets {
         beta.java.srcDirs = ['src/release/java']
     }

Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java

@@ -262,7 +262,8 @@ public class MainSettingsController extends SettingsController implements Toolba
         }
         final String finalVersion = version;
 
-        about.add(new LinkSettingView(this, getString(R.string.app_name), version, new View.OnClickListener() {
+        String userVersion = version + " " + getString(R.string.app_flavor_name);
+        about.add(new LinkSettingView(this, getString(R.string.app_name), userVersion, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if ((++clickCount) % 5 == 0) {

Clover/app/src/main/java/org/floens/chan/ui/helper/PreviousVersionHandler.java

@@ -54,6 +54,7 @@ public class PreviousVersionHandler {
      * 52 = v2.1.0 = 2
      * 53 = v2.1.1 = 2
      * 54 = v2.1.2 = 2
+     * 55 = v2.1.3 = 2
      */
     private static final int CURRENT_VERSION = 2;
 

Clover/app/src/main/res/values/private_strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="extra_abouts">
+        <item>Donate to Clover development</item>
+        <item>Give a PayPal or Bitcoin donation to the Clover developer</item>
+        <item>https://floens.github.io/Clover/#donate</item>
+
+        <item>Rate Clover</item>
+        <item>Rate Clover on Google Play</item>
+        <item>https://play.google.com/store/apps/details?id=org.floens.chan</item>
+
+        <item>Find Clover on GitHub</item>
+        <item>View the source code and give feedback</item>
+        <item>https://github.com/Floens/Clover</item>
+
+        <item>Send feedback</item>
+        <item>Email developer for feedback and questions</item>
+        <item>florens@airmail.cc__EMAIL__Clover feedback __VERSION__</item>
+    </string-array>
+</resources>

Clover/app/src/main/res/values/strings.xml

@@ -16,7 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="app_name">Clover</string>
+    <!-- Defined in gradle flavor -->
+    <!--<string name="app_name">Clover</string>-->
 
     <string name="previous_version_1">
         <![CDATA[