diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
index 41b1a65d..a9ae4d10 100644
--- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
@@ -19,8 +19,6 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
@@ -63,31 +61,20 @@ public class AboutActivity extends BaseBarActivity {
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
- String version = "";
- try {
- PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
- version = pInfo.versionName;
- binding.aboutVersion.setText(getResources().getString(R.string.about_vesrion, version));
- } catch (PackageManager.NameNotFoundException ignored) {
- }
+ String version = "v" + BuildConfig.VERSION_NAME + " (" + (BuildConfig.DONATIONS ? "F-Droid" : "Google") + ")";
+ binding.aboutVersion.setText(version);
binding.aboutCode.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://codeberg.org/tom79/Fedilab"));
binding.aboutThekinrar.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://instances.social/"));
binding.aboutLicense.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.gnu.org/licenses/quick-guide-gplv3.fr.html"));
- binding.aboutSupport.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://liberapay.com/tom79"));
- if (BuildConfig.DONATIONS) {
- binding.aboutSupport.setVisibility(View.VISIBLE);
- } else {
- binding.aboutSupport.setVisibility(View.GONE);
- }
- binding.aboutSupportPaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));
+ binding.donateLiberapay.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://liberapay.com/tom79"));
+ binding.donatePaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));
+ binding.donateOpencollective.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://opencollective.com/fedilab"));
-
- String finalVersion = version;
binding.aboutVersionCopy.setOnClickListener(v -> {
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
- String content = "Fedilab v" + finalVersion + " for " + (BuildConfig.DONATIONS ? "FDroid" : "Google");
+ String content = "Fedilab " + version;
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, content);
if (clipboard != null) {
@@ -96,11 +83,7 @@ public class AboutActivity extends BaseBarActivity {
}
});
- if (BuildConfig.DONATIONS) {
- binding.aboutSupportPaypal.setVisibility(View.VISIBLE);
- } else {
- binding.aboutSupportPaypal.setVisibility(View.GONE);
- }
+ binding.donateLinks.setVisibility(BuildConfig.DONATIONS ? View.VISIBLE : View.GONE);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
binding.aboutWebsite.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://fedilab.app"));
CrossActionHelper.fetchRemoteAccount(AboutActivity.this, "@apps@toot.fedilab.app", new CrossActionHelper.Callback() {
@@ -112,8 +95,6 @@ public class AboutActivity extends BaseBarActivity {
@Override
public void federatedAccount(Account account) {
if (account != null && account.username.equalsIgnoreCase("apps")) {
- binding.developerTitle.setVisibility(View.VISIBLE);
- binding.acccountContainer.setVisibility(View.VISIBLE);
MastodonHelper.loadPPMastodon(binding.accountPp, account);
binding.accountDn.setText(account.display_name);
binding.accountUn.setText(account.acct);
diff --git a/app/src/main/res/drawables/peertube/drawable/ic_opencollective.xml b/app/src/main/res/drawables/peertube/drawable/ic_opencollective.xml
new file mode 100644
index 00000000..24988ef8
--- /dev/null
+++ b/app/src/main/res/drawables/peertube/drawable/ic_opencollective.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/layouts/mastodon/layout/activity_about.xml b/app/src/main/res/layouts/mastodon/layout/activity_about.xml
index 4d7114ad..f11ec57f 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_about.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_about.xml
@@ -24,227 +24,231 @@
+ android:orientation="vertical"
+ android:paddingHorizontal="12dp"
+ android:paddingVertical="24dp">
+
+
+
-
-
-
-
-
-
-
-
-
-
+ android:layout_gravity="center"
+ android:layout_marginTop="6dp"
+ android:text="@string/app_name"
+ android:textAlignment="center"
+ android:textAppearance="@style/TextAppearance.Material3.TitleLarge" />
-
+
+
+
+
+
+
+
+
-
-
+ android:layout_marginTop="6dp">
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="12dp">
-
+
+
+ android:layout_marginStart="12dp"
+ android:layout_weight="1"
+ android:orientation="vertical">
-
+
+
+
+
+
+
+ android:contentDescription="@string/make_an_action"
+ android:scaleType="fitCenter"
+ android:visibility="gone"
+ app:layout_constraintStart_toEndOf="@id/avatar_container"
+ app:layout_constraintTop_toBottomOf="@id/banner_container"
+ tools:icon="@drawable/ic_baseline_person_add_24"
+ tools:visibility="visible" />
+
+
+
+
+
+
+
+ android:id="@+id/donate_liberapay"
+ style="@style/Widget.Material3.Button.TextButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="6dp"
+ android:text="Liberapay"
+ app:icon="@drawable/ic_liberapay"
+ tools:ignore="HardcodedText" />
+
+
+
+
-
-
-
-
-
+ android:layout_marginTop="12dp"
+ android:text="@string/about_website"
+ android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
-
-
-
-
+ android:layout_marginTop="12dp"
+ android:text="@string/about_license"
+ android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
-
-
-
-
-
-
-
+ android:layout_marginTop="6dp"
+ android:text="@string/about_license_action"
+ app:icon="@drawable/ic_open_external" />
-
-
-
-
+
+
+
-
-
-
-
-
-
+ android:layout_marginTop="12dp"
+ android:text="@string/about_thekinrar"
+ android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34fdd734..709be23a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -186,9 +186,12 @@
License:
GNU GPL V3
Source code:
- CodeBerg
+ Codeberg
Search instances:
instances.social
+ Fediverse:
+ Website:
+ Donate:
No account to display