Adding support button to no-ads version

vbresan · vbresan · commit 5017fd262283 · 2025-07-12T15:34:40.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 .externalNativeBuild
 .cxx
 /app/build/
-/app/release/
+release/
 /nativetemplates/
 /gradlew
 /gradlew.bat
diff --git a/app/src/main/java/biz/binarysolutions/vatcalculator/Main.java b/app/src/main/java/biz/binarysolutions/vatcalculator/Main.java
@@ -29,7 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import biz.binarysolutions.vatcalculator.util.AdHandler;
+import biz.binarysolutions.vatcalculator.util.FlavorSpecific;
 import biz.binarysolutions.vatcalculator.util.DefaultTextWatcher;
 import biz.binarysolutions.vatcalculator.util.Spinner;
 
@@ -484,7 +484,7 @@ public void onCreate(Bundle savedInstanceState) {
 		setStartIconOnClickListeners();
 		setEditTextListeners();
 
-		AdHandler.initialize(this);
+		new FlavorSpecific(this).initializeBottomBar();
 		antiFlickWorkaround();
     }
 }
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -130,7 +130,7 @@
 
         </LinearLayout>
 
-        <include layout="@layout/banner_ad" />
+        <include layout="@layout/bottom_bar" />
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/withAds/java/biz/binarysolutions/vatcalculator/util/FlavorSpecific.java b/app/src/withAds/java/biz/binarysolutions/vatcalculator/util/FlavorSpecific.java
@@ -1,6 +1,6 @@
 package biz.binarysolutions.vatcalculator.util;
 
-import androidx.appcompat.app.AppCompatActivity;
+import android.app.Activity;
 
 import com.google.android.ads.nativetemplates.NativeTemplateStyle;
 import com.google.android.ads.nativetemplates.TemplateView;
@@ -10,16 +10,15 @@
 
 import biz.binarysolutions.vatcalculator.R;
 
-/**
- *
- */
-public class AdHandler {
+public class FlavorSpecific {
 
-    /**
-     *
-     * @param activity
-     */
-    public static void initialize(AppCompatActivity activity) {
+    private final Activity activity;
+
+    public FlavorSpecific(Activity activity) {
+        this.activity = activity;
+    }
+
+    public void initializeBottomBar() {
 
         MobileAds.initialize(activity);
 
diff --git a/app/src/withAds/res/layout/bottom_bar.xml b/app/src/withAds/res/layout/bottom_bar.xml
diff --git a/app/src/withoutAds/java/biz/binarysolutions/vatcalculator/util/AdHandler.java b/app/src/withoutAds/java/biz/binarysolutions/vatcalculator/util/AdHandler.java
diff --git a/app/src/withoutAds/java/biz/binarysolutions/vatcalculator/util/FlavorSpecific.java b/app/src/withoutAds/java/biz/binarysolutions/vatcalculator/util/FlavorSpecific.java
@@ -0,0 +1,51 @@
+package biz.binarysolutions.vatcalculator.util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import biz.binarysolutions.vatcalculator.R;
+
+public class FlavorSpecific {
+
+    private final Activity activity;
+
+    private void donate(View view) {
+
+        AlertDialog.Builder builder =
+            new MaterialAlertDialogBuilder(activity, R.style.AlertDialog);
+
+        builder.setTitle(R.string.DonateDialogTitle);
+        builder.setMessage(R.string.DonateDialogContent);
+
+        builder.setPositiveButton(R.string.Continue, (dialog, which) -> {
+
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(activity.getString(R.string.donation_url)));
+            activity.startActivity(intent);
+
+            dialog.dismiss();
+        });
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    public FlavorSpecific(Activity activity) {
+        this.activity = activity;
+    }
+
+    public void initializeBottomBar() {
+
+        Button button = activity.findViewById(R.id.buttonShowSupport);
+        if (button != null) {
+            button.setOnClickListener(this::donate);
+        }
+    }
+}
diff --git a/app/src/withoutAds/res/layout/banner_ad.xml b/app/src/withoutAds/res/layout/banner_ad.xml
diff --git a/app/src/withoutAds/res/layout/bottom_bar.xml b/app/src/withoutAds/res/layout/bottom_bar.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="bottom"
+    >
+    <Button
+        android:id="@+id/buttonShowSupport"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Show support"
+        style="?android:attr/buttonBarButtonStyle"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:layout_marginHorizontal="0dp"
+    />
+</LinearLayout>
diff --git a/app/src/withoutAds/res/values-hr/strings.xml b/app/src/withoutAds/res/values-hr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="ShowSupport">Pokaži podršku</string>
+    <string name="Continue">Nastavi</string>
+    <string name="DonateDialogTitle">Ova aplikacija treba tvoju podršku</string>
+    <string name="DonateDialogContent">
+        Ova aplikacija je besplatna, otvorenog koda, bez oglasa i bez praćenja
+        aktivnosti korisnika. Kako bi takva i ostala, ako možeš, doniraj danas.
+    </string>
+
+</resources>
diff --git a/app/src/withoutAds/res/values/donottranslate.xml b/app/src/withoutAds/res/values/donottranslate.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="donation_url">https://ko-fi.com/vbresan/?utm_source=vatcalculator&amp;utm_medium=app</string>
+</resources>
diff --git a/app/src/withoutAds/res/values/strings.xml b/app/src/withoutAds/res/values/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="ShowSupport">Show support</string>
+    <string name="Continue">Continue</string>
+    <string name="DonateDialogTitle">This app needs your support</string>
+    <string name="DonateDialogContent">
+        This app is free, open-source, and has no ads or trackers. To keep
+        it that way, if you can, please donate today.
+    </string>
+
+</resources>
diff --git a/app/src/withoutAds/res/values/styles.xml b/app/src/withoutAds/res/values/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+    <style name="AlertDialog" parent="@style/MaterialAlertDialog.Material3">
+        <item name="materialAlertDialogBodyTextStyle">@style/AlertDialog.Body.Text</item>
+        <item name="buttonBarPositiveButtonStyle">@style/AlertDialog.Button.Text</item>
+    </style>
+    <style name="AlertDialog.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
+        <item name="android:textAppearance">@style/TextAppearance.Material3.BodyLarge</item>
+    </style>
+    <style name="AlertDialog.Button.Text" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textSize">16sp</item>
+    </style>
+</resources>
diff --git a/metadata/en-US/changelogs/11.txt b/metadata/en-US/changelogs/11.txt
@@ -1,3 +1,4 @@
 2.0.5 (2024.07.12)
 
 * targeting android SDK version 35
+* adding support button to no-ads version

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`import java.util.ArrayList;`
`30`	`30`	`import java.util.List;`
`31`	`31`
`32`		`-import biz.binarysolutions.vatcalculator.util.AdHandler;`
	`32`	`+import biz.binarysolutions.vatcalculator.util.FlavorSpecific;`
`33`	`33`	`import biz.binarysolutions.vatcalculator.util.DefaultTextWatcher;`
`34`	`34`	`import biz.binarysolutions.vatcalculator.util.Spinner;`
`35`	`35`
`@@ -484,7 +484,7 @@ public void onCreate(Bundle savedInstanceState) {`
`484`	`484`	`setStartIconOnClickListeners();`
`485`	`485`	`setEditTextListeners();`
`486`	`486`
`487`		`- AdHandler.initialize(this);`
	`487`	`+ new FlavorSpecific(this).initializeBottomBar();`
`488`	`488`	`antiFlickWorkaround();`
`489`	`489`	`}`
`490`	`490`	`}`