Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace Paypal with Liberapay

This commit is contained in:
Thomas 2020-05-08 15:53:05 +02:00
parent 40d742e4a0
commit 48085819ff
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
View File

@ -1113,7 +1113,7 @@ public abstract class BaseMainActivity extends BaseActivity
} }
if (!BuildConfig.DONATIONS) { if (!BuildConfig.DONATIONS) {
MenuItem openCollectiveItem = navigationView.getMenu().findItem(R.id.nav_opencollective); MenuItem openCollectiveItem = navigationView.getMenu().findItem(R.id.nav_liberapay);
if (openCollectiveItem != null) { if (openCollectiveItem != null) {
openCollectiveItem.setVisible(false); openCollectiveItem.setVisible(false);
} }
@ -1721,13 +1721,13 @@ public abstract class BaseMainActivity extends BaseActivity
Intent intent = new Intent(BaseMainActivity.this, AboutActivity.class); Intent intent = new Intent(BaseMainActivity.this, AboutActivity.class);
startActivity(intent); startActivity(intent);
return false; return false;
} else if (id == R.id.nav_opencollective) { } else if (id == R.id.nav_liberapay) {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://www.paypal.me/mastalab")); intent.setData(Uri.parse("https://liberapay.com/tom79"));
try { try {
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
Helper.openBrowser(BaseMainActivity.this, "https://www.paypal.me/mastalab"); Helper.openBrowser(BaseMainActivity.this, "https://liberapay.com/tom79");
} }
return false; return false;
} else if (id == R.id.nav_upload) { } else if (id == R.id.nav_upload) {

2
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -1534,7 +1534,7 @@ public class Helper {
} }
} }
if (!BuildConfig.DONATIONS) { if (!BuildConfig.DONATIONS) {
MenuItem openCollectiveItem = menu.findItem(R.id.nav_opencollective); MenuItem openCollectiveItem = menu.findItem(R.id.nav_liberapay);
if (openCollectiveItem != null) { if (openCollectiveItem != null) {
openCollectiveItem.setVisible(false); openCollectiveItem.setVisible(false);
} }

10
app/src/main/res/menu/activity_main_drawer.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<group> <group>
<!-- MASTODON MENU --> <!-- MASTODON MENU -->
@ -178,9 +179,10 @@
<menu> <menu>
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item <item
android:id="@+id/nav_opencollective" android:id="@+id/nav_liberapay"
android:icon="@drawable/ic_attach_money" android:icon="@drawable/ic_liberapay"
android:title="PaypalMe" /> android:title="Liberapay"
tools:ignore="HardcodedText" />
<item <item
android:id="@+id/nav_how_to" android:id="@+id/nav_how_to"
android:icon="@drawable/ic_videocam" android:icon="@drawable/ic_videocam"