From 87f76b0286c2a14659c92779cde8b6b5471bd874 Mon Sep 17 00:00:00 2001
From: woesss <yurets.droid@gmail.com>
Date: Sun, 10 Sep 2023 15:07:02 +0300
Subject: [PATCH] version 0.84.2

---
 .github/FUNDING.yml                           |  2 +-
 app/build.gradle                              |  4 +--
 .../donations/DonationsFragment.java          | 30 +++++--------------
 .../main/res/layout/fragment_donations.xml    | 20 ++-----------
 4 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 3c37fcbdd..ca0d4bb15 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ["https://www.paypal.me/j2meforever", "https://my.qiwi.com/Yuryi-Khk_7vnCWvd"]
+custom: ["https://yoomoney.ru/to/4100118352955609"]
diff --git a/app/build.gradle b/app/build.gradle
index b238108ba..87536cffc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "ru.woesss.j2meloader"
         minSdk MIN_SDK
         targetSdk TARGET_SDK
-        versionCode 38
-        versionName "0.84.1"
+        versionCode 39
+        versionName "0.84.2"
         resValue 'string', 'app_name', rootProject.name
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/ru/playsoftware/j2meloader/donations/DonationsFragment.java b/app/src/main/java/ru/playsoftware/j2meloader/donations/DonationsFragment.java
index 38884dc05..ea901f6e3 100644
--- a/app/src/main/java/ru/playsoftware/j2meloader/donations/DonationsFragment.java
+++ b/app/src/main/java/ru/playsoftware/j2meloader/donations/DonationsFragment.java
@@ -47,34 +47,20 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
 	@Override
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-		// PayPal
+		// JL-Mod
 
-		view.<ViewStub>findViewById(R.id.donations_paypal_stub_me)
-				.inflate()
-				.<Button>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_donate_button)
-				.setOnClickListener(v -> donateOnClick("https://www.paypal.me/j2meforever"));
+		View ym = view.<ViewStub>findViewById(R.id.donations_yoomoney_stub_me).inflate();
+		ym.<Button>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_donate_button)
+				.setOnClickListener(v -> donateOnClick("https://yoomoney.ru/to/4100118352955609"));
 
-		// Qiwi
-		View qiwiView = view.<ViewStub>findViewById(R.id.donations_qiwi_stub_me).inflate();
-
-		qiwiView.<Button>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_donate_button)
-				.setOnClickListener(v -> donateOnClick("https://my.qiwi.com/Yuryi-Khk_7vnCWvd"));
-
-		qiwiView.<TextView>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_title)
-				.setText("Qiwi");
-
-
-		// PayPal
-
-		view.<ViewStub>findViewById(R.id.donations_paypal_stub_jl).inflate()
-				.<Button>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_donate_button)
-				.setOnClickListener(v -> donateOnClick("https://www.paypal.me/nikita36078"));
+		ym.<TextView>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_title)
+				.setText("ЮMoney");
 
-		// Yandex
+		// J2ME Loader
 		View ymView = view.<ViewStub>findViewById(R.id.donations_ym_stub_jl).inflate();
 
 		ymView.<Button>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_donate_button)
-				.setOnClickListener(v -> donateOnClick("https://money.yandex.ru/to/41001670387745"));
+				.setOnClickListener(v -> donateOnClick("https://yoomoney.ru/to/41001670387745"));
 
 		ymView.<TextView>findViewById(org.sufficientlysecure.donations.R.id.donations__paypal_title)
 				.setText("ЮMoney");
diff --git a/app/src/main/res/layout/fragment_donations.xml b/app/src/main/res/layout/fragment_donations.xml
index 1c83bee4f..bfa2af0a5 100644
--- a/app/src/main/res/layout/fragment_donations.xml
+++ b/app/src/main/res/layout/fragment_donations.xml
@@ -20,40 +20,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="JL-Mod:"
+        android:text="@string/app_name"
         android:textAppearance="?android:textAppearanceLarge"
         tools:ignore="HardcodedText" />
 
     <ViewStub
-        android:id="@+id/donations_paypal_stub_me"
+        android:id="@+id/donations_yoomoney_stub_me"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inflatedId="@+id/donations_paypal_me"
         android:layout="@layout/donations__fragment_paypal" />
 
-    <ViewStub
-        android:id="@+id/donations_qiwi_stub_me"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/donations_qiwi_me"
-        android:layout="@layout/donations__fragment_paypal" />
-
     <TextView
         android:id="@+id/textView3"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="J2ME Loader:"
+        android:text="J2ME Loader"
         android:textAppearance="?android:textAppearanceLarge"
         tools:ignore="HardcodedText" />
 
-    <ViewStub
-        android:id="@+id/donations_paypal_stub_jl"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/donations_paypal_jl"
-        android:layout="@layout/donations__fragment_paypal" />
-
     <ViewStub
         android:id="@+id/donations_ym_stub_jl"
         android:layout_width="match_parent"