From 0db3bed589d1bfc78bdbe16e0f8594a669b6915e Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 11 Apr 2023 20:48:07 +0500 Subject: [PATCH] Refactor About dialog UI --- .../gitnex/fragments/SettingsFragment.java | 13 +- app/src/main/res/drawable/ic_bmc.xml | 41 ++++ app/src/main/res/drawable/ic_code_v2.xml | 27 +++ app/src/main/res/drawable/ic_feedback.xml | 48 ++++ app/src/main/res/drawable/ic_patreon.xml | 20 ++ .../main/res/layout/custom_about_dialog.xml | 219 ++++++++++-------- app/src/main/res/layout/fragment_settings.xml | 55 +++++ app/src/main/res/values/strings.xml | 4 +- 8 files changed, 331 insertions(+), 96 deletions(-) create mode 100644 app/src/main/res/drawable/ic_bmc.xml create mode 100644 app/src/main/res/drawable/ic_code_v2.xml create mode 100644 app/src/main/res/drawable/ic_feedback.xml create mode 100644 app/src/main/res/drawable/ic_patreon.xml diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java index 0546c0d2..7a2b40f7 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java @@ -63,6 +63,9 @@ public class SettingsFragment extends Fragment { fragmentSettingsBinding.appearanceFrame.setOnClickListener( v1 -> startActivity(new Intent(ctx, SettingsAppearanceActivity.class))); + fragmentSettingsBinding.codeEditorFrame.setOnClickListener( + v1 -> startActivity(new Intent(ctx, SettingsReportsActivity.class))); + fragmentSettingsBinding.draftsFrame.setOnClickListener( v1 -> startActivity(new Intent(ctx, SettingsDraftsActivity.class))); @@ -135,10 +138,14 @@ public class SettingsFragment extends Fragment { requireContext(), getResources().getString(R.string.appWebsiteLink)); }); + aboutAppDialogBinding.feedback.setOnClickListener( + v14 -> { + AppUtil.openUrlInBrowser( + requireContext(), getResources().getString(R.string.feedbackLink)); + }); + if (AppUtil.isPro(requireContext())) { - aboutAppDialogBinding.supportHeader.setVisibility(View.GONE); - aboutAppDialogBinding.donationLinkPatreon.setVisibility(View.GONE); - aboutAppDialogBinding.donationLinkBuyMeaCoffee.setVisibility(View.GONE); + aboutAppDialogBinding.layoutFrame1.setVisibility(View.GONE); } materialAlertDialogBuilder.show(); diff --git a/app/src/main/res/drawable/ic_bmc.xml b/app/src/main/res/drawable/ic_bmc.xml new file mode 100644 index 00000000..032d1c04 --- /dev/null +++ b/app/src/main/res/drawable/ic_bmc.xml @@ -0,0 +1,41 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_code_v2.xml b/app/src/main/res/drawable/ic_code_v2.xml new file mode 100644 index 00000000..a53e7ecc --- /dev/null +++ b/app/src/main/res/drawable/ic_code_v2.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_feedback.xml b/app/src/main/res/drawable/ic_feedback.xml new file mode 100644 index 00000000..4a939626 --- /dev/null +++ b/app/src/main/res/drawable/ic_feedback.xml @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_patreon.xml b/app/src/main/res/drawable/ic_patreon.xml new file mode 100644 index 00000000..fcf20bb7 --- /dev/null +++ b/app/src/main/res/drawable/ic_patreon.xml @@ -0,0 +1,20 @@ + + + + diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml index 6d34559e..4b75a10a 100644 --- a/app/src/main/res/layout/custom_about_dialog.xml +++ b/app/src/main/res/layout/custom_about_dialog.xml @@ -9,7 +9,8 @@ + android:layout_height="wrap_content" + android:layout_margin="@dimen/dimen16dp"> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/appVersionBuild" - android:textColor="@color/retroThemeColorSecondary" + android:textColor="@color/retroThemeInputTextColor" android:textIsSelectable="true" android:paddingTop="@dimen/dimen8dp" android:paddingBottom="@dimen/dimen8dp" @@ -85,112 +85,147 @@ - + + + + + + + + + + android:layout_marginTop="@dimen/dimen12dp" + android:orientation="horizontal"> - - + - - + + + + + + android:layout_marginTop="@dimen/dimen12dp" + android:orientation="horizontal"> - + + + + + + + + android:layout_marginTop="@dimen/dimen12dp" + android:orientation="horizontal"> - - + - - - - - + - - diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index bade5151..5fc35e2e 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -128,6 +128,61 @@ + + + + + + + + + + + + + + + + Your Instance Version https://www.patreon.com/mmarif https://www.buymeacoffee.com/mmarif + https://www.buymeacoffee.com/mmarif %s / %d GitNex is a free, open-source Android client for Git repository management tools Forgejo and Gitea. GitNex is Licensed under GPLv3.\n\nThanks to all the contributors and donators for your generous work and donations. https://crowdin.com/project/gitnex @@ -17,7 +18,8 @@ Support Patreon - Buy Me a Coffee + BMC + Feedback My Repositories