From 41bfa54b0110bd11c767584e29cf7313e4b0f0b2 Mon Sep 17 00:00:00 2001 From: darken Date: Sat, 25 Aug 2018 15:16:09 +0200 Subject: [PATCH] Remove donate call and add link to revamped version. --- app/build.gradle | 12 ++-- .../java/eu/thedarken/wl/dialogs/About.java | 11 +-- app/src/main/res/layout/dialog_about.xml | 14 ++-- app/src/main/res/values/strings.xml | 4 +- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 54208 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 68 ++++++++++-------- gradlew.bat | 14 ++-- 9 files changed, 70 insertions(+), 60 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 994b4f9..4bbfbc5 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,20 +5,16 @@ static def gitSha() { } def versionRewrite = 2 -def versionRelease = 3 +def versionRelease = 5 android { signingConfigs { release { } } - signingConfigs { - release { - } - } - def signingPropFile = new File(System.properties['user.home'], ".signing/wakelock/signing.properties") + def signingPropFile = new File(System.properties['user.home'], ".appconfig/eu.thedarken.wl/signing.properties") if (signingPropFile.canRead()) { - def Properties signingProps = new Properties() + Properties signingProps = new Properties() signingProps.load(new FileInputStream(signingPropFile)) signingConfigs { release { @@ -31,7 +27,7 @@ android { } compileSdkVersion 7 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { minSdkVersion 7 diff --git a/app/src/main/java/eu/thedarken/wl/dialogs/About.java b/app/src/main/java/eu/thedarken/wl/dialogs/About.java index f3c12dc..2c3ecb4 100755 --- a/app/src/main/java/eu/thedarken/wl/dialogs/About.java +++ b/app/src/main/java/eu/thedarken/wl/dialogs/About.java @@ -5,11 +5,11 @@ import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.net.Uri; +import android.os.Build; import android.view.View; import android.widget.Button; import android.widget.TextView; -import eu.thedarken.wl.BuildConfig; import eu.thedarken.wl.R; public class About extends Dialog { @@ -34,12 +34,13 @@ public About(Context context) { TextView about = (TextView) findViewById(R.id.about); about.setText(R.string.about_text); - Button donate = (Button) findViewById(R.id.donate); - donate.setVisibility(BuildConfig.FLAVOR.equals("free") ? View.VISIBLE : View.GONE); - donate.setOnClickListener(new android.view.View.OnClickListener() { + findViewById(R.id.upgrade_hint).setVisibility(Build.VERSION.SDK_INT >= 16 ? View.VISIBLE : View.GONE); + Button upgrade = (Button) findViewById(R.id.upgrade); + upgrade.setVisibility(Build.VERSION.SDK_INT >= 16 ? View.VISIBLE : View.GONE); + upgrade.setOnClickListener(new android.view.View.OnClickListener() { @Override public void onClick(View v) { - Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=eu.thedarken.wldonate")); + Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=eu.thedarken.wldonate")); getContext().startActivity(marketIntent); } }); diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml index 79deb6f..a404219 100755 --- a/app/src/main/res/layout/dialog_about.xml +++ b/app/src/main/res/layout/dialog_about.xml @@ -27,13 +27,19 @@ android:paddingBottom="8dp" android:text="@string/about"/> + + android:orientation="horizontal" + android:paddingTop="8dp">