Merge pull request #1455 from moneymanagerex/v19

clean up rate link and simplify donation link
moneymanagerex · Nov 28, 2023 · 3d1130f · 3d1130f
2 parents 317a71c + e361a59
commit 3d1130f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/app/src/main/java/com/money/manager/ex/DonateActivity.java b/app/src/main/java/com/money/manager/ex/DonateActivity.java
@@ -83,7 +83,7 @@ protected void onDirectDonationClick() {
 
     @OnClick(R.id.homepageButton)
     protected void onHomepageClick() {
-        String siteUrl = "http://android.moneymanagerex.org/";
+        String siteUrl = "https://moneymanagerex.org/?utm_campaign=Application_Android";
 
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(siteUrl));
 

diff --git a/app/src/main/java/com/money/manager/ex/about/AboutFragment.java b/app/src/main/java/com/money/manager/ex/about/AboutFragment.java
@@ -102,13 +102,15 @@ public void onClick(View v) {
         });
 
         // rate application
+        /*
         TextView txtRate = view.findViewById(R.id.textViewLinkRate);
         text = "<u>" + txtRate.getText() + "</u>";
         txtRate.setText(Html.fromHtml(text));
         txtRate.setMovementMethod(LinkMovementMethod.getInstance());
         OnClickListenerUrl clickListenerRate = new OnClickListenerUrl();
         clickListenerRate.setUrl("http://play.google.com/store/apps/details?id=com.money.manager.ex");
         txtRate.setOnClickListener(clickListenerRate);
+        */
 
         // application issue tracker
         TextView txtIssues = view.findViewById(R.id.textViewIssuesTracker);

diff --git a/app/src/main/java/com/money/manager/ex/home/MainActivity.java b/app/src/main/java/com/money/manager/ex/home/MainActivity.java
@@ -1084,11 +1084,11 @@ private ArrayList<DrawerMenuItem> getDrawerMenuItems() {
                 .withIconDrawable(uiHelper.getIcon(GoogleMaterial.Icon.gmd_settings)
                         .color(iconColor)));
         // Donate
-        menuItems.add(new DrawerMenuItem().withId(R.id.menu_donate)
-                .withText(getString(R.string.donate))
-                .withIconDrawable(uiHelper.getIcon(GoogleMaterial.Icon.gmd_card_giftcard)
-                        .color(iconColor))
-                .withDivider(Boolean.TRUE));
+        // menuItems.add(new DrawerMenuItem().withId(R.id.menu_donate)
+        //        .withText(getString(R.string.donate))
+        //        .withIconDrawable(uiHelper.getIcon(GoogleMaterial.Icon.gmd_card_giftcard)
+        //                .color(iconColor))
+        //        .withDivider(Boolean.TRUE));
         // Help
         menuItems.add(new DrawerMenuItem().withId(R.id.menu_about)
                 .withText(getString(R.string.about))

diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
@@ -68,14 +68,6 @@
             android:layout_marginTop="4dp"
             android:text="@string/mmex_website"/>
 
-        <com.money.manager.ex.view.RobotoTextView
-            android:id="@+id/textViewLinkRate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="4dp"
-            android:text="@string/rate_application"/>
-
         <com.money.manager.ex.view.RobotoTextView
             android:id="@+id/textViewLinkFeedback"
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -569,7 +569,7 @@
     <string name="update_available">Update available</string>
     <string name="update_available_online">There is an updated database file available online. Would you like to update?</string>
     <string name="currency_not_found">Currency not found</string>
-    <string name="homepage">Our homepage is http://android.moneymanagerex.org/</string>
+    <string name="homepage">Our homepage is https://moneymanagerex.org/</string>
     <string name="current_database">Current database</string>
     <string name="about_logcat_header">You can send us the application log by clicking the button below.</string>
     <string name="transaction_type_filter">Filter by Transaction Type</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -48,10 +48,6 @@
         android:icon="@null"
         android:key="@string/pref_database"
         android:title="@string/database" />
-    <Preference
-        android:icon="@null"
-        android:key="@string/pref_donate"
-        android:title="@string/donate" />
     <Preference
         android:icon="@null"
         android:key="@string/pref_version_name"