Add Play variant

Apparently PayPal donation links aren't allowed
kdrag0n · Aug 19, 2018 · 2327644 · 2327644
1 parent 966efef
commit 2327644
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.kdrag0n.tipatch"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 1010
+        versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "en"
 
@@ -21,13 +21,26 @@ android {
             }
         }
     }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             shrinkResources true
         }
     }
+
+    flavorDimensions "flags"
+    productFlavors {
+        standard {
+            dimension "flags"
+        }
+
+        play {
+            dimension "flags"
+        }
+    }
+
     externalNativeBuild {
         cmake {
             path 'CMakeLists.txt'

diff --git a/app/src/main/java/com/kdrag0n/tipatch/AboutActivity.kt b/app/src/main/java/com/kdrag0n/tipatch/AboutActivity.kt
@@ -5,6 +5,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
+import android.view.View
 import kotlinx.android.synthetic.main.activity_about.*
 
 class AboutActivity : AppCompatActivity() {
@@ -26,8 +27,12 @@ class AboutActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
-        about_donate.summary = R.string.about_donate_desc()
-        about_donate.uri = R.string.donate_uri
+        if (resources.getBoolean(R.bool.showPaypal)) {
+            about_donate.summary = R.string.about_donate_desc()
+            about_donate.uri = R.string.donate_uri
+        } else {
+            about_donate.visibility = View.GONE
+        }
 
         about_author.summary = R.string.author_nick()
         about_author.uri = R.string.website_uri

diff --git a/app/src/main/res/menu/actions.xml b/app/src/main/res/menu/actions.xml
@@ -18,5 +18,6 @@
     <item
         android:id="@+id/donateOpt"
         android:title="@string/donate"
+        android:visible="@bool/showPaypal"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="isPhone">true</bool>
+    <bool name="showPaypal">true</bool>
 
     <declare-styleable name="AboutCardRow">
         <attr name="icon" format="reference"/>

diff --git a/app/src/play/res/values/attr.xml b/app/src/play/res/values/attr.xml
@@ -0,0 +1,3 @@
+<resources>
+    <bool name="showPaypal">false</bool>
+</resources>