diff --git a/.gitignore b/.gitignore
index 6239258a..5272c0c0 100644
--- a/.gitignore
+++ b/.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/
diff --git a/CHANGES.txt b/CHANGES.txt
index 976a319a..aabd5b88 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle
index d49a359b..e748d8c4 100644
--- a/Clover/app/build.gradle
+++ b/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']
}
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
index e9224eb7..14de283b 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
+++ b/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) {
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/helper/PreviousVersionHandler.java b/Clover/app/src/main/java/org/floens/chan/ui/helper/PreviousVersionHandler.java
index e181adf4..712f6d91 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/helper/PreviousVersionHandler.java
+++ b/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;
diff --git a/Clover/app/src/main/res/values/private_strings.xml b/Clover/app/src/main/res/values/private_strings.xml
new file mode 100644
index 00000000..448003b7
--- /dev/null
+++ b/Clover/app/src/main/res/values/private_strings.xml
@@ -0,0 +1,20 @@
+
+
+
+ - Donate to Clover development
+ - Give a PayPal or Bitcoin donation to the Clover developer
+ - https://floens.github.io/Clover/#donate
+
+ - Rate Clover
+ - Rate Clover on Google Play
+ - https://play.google.com/store/apps/details?id=org.floens.chan
+
+ - Find Clover on GitHub
+ - View the source code and give feedback
+ - https://github.com/Floens/Clover
+
+ - Send feedback
+ - Email developer for feedback and questions
+ - florens@airmail.cc__EMAIL__Clover feedback __VERSION__
+
+
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 48707422..9878aa16 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/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 .
-->
- Clover
+
+