From 5f8afbf68ad19bc99441b4e861e2f06649ff6de9 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Wed, 5 Aug 2020 16:41:57 +0300 Subject: [PATCH] Update 'About' tab. Add more information for donations and stuff like this --- .../ns_usbloader/AboutActivity.java | 35 +++++ .../main/res/drawable/ic_donate_libera.xml | 33 ++++ .../main/res/drawable/ic_donate_paypal.xml | 24 +++ .../main/res/drawable/ic_donate_yandex.xml | 41 +++++ app/src/main/res/layout/content_about.xml | 146 +++++++++++------- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 8 files changed, 225 insertions(+), 60 deletions(-) create mode 100644 app/src/main/res/drawable/ic_donate_libera.xml create mode 100644 app/src/main/res/drawable/ic_donate_paypal.xml create mode 100644 app/src/main/res/drawable/ic_donate_yandex.xml diff --git a/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java b/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java index c8115a1..965d3ee 100644 --- a/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java +++ b/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java @@ -1,8 +1,12 @@ package com.blogspot.developersu.ns_usbloader; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.text.method.LinkMovementMethod; import android.view.MenuItem; +import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; @@ -31,5 +35,36 @@ public class AboutActivity extends AppCompatActivity { t4.setMovementMethod(LinkMovementMethod.getInstance()); final TextView t6 = findViewById(R.id.textView6); t6.setMovementMethod(LinkMovementMethod.getInstance()); + + ImageView donateLibera = findViewById(R.id.donateLiberaImageView); + donateLibera.setOnClickListener(this::donateLiberaOnClickAction); + + ImageView donatePaypal = findViewById(R.id.donatePaypalImageView); + donatePaypal.setOnClickListener(this::donatePaypalOnClickAction); + + ImageView donateYandex = findViewById(R.id.donateYandexImageView); + donateYandex.setOnClickListener(this::donateYandexOnClickAction); + } + + private void donateLiberaOnClickAction(View view){ + String url = "https://liberapay.com/developersu/donate"; + createOpenBrowserIntent(url); + } + private void donatePaypalOnClickAction(View view){ + String url = "https://www.paypal.me/developersu"; + createOpenBrowserIntent(url); + } + private void donateYandexOnClickAction(View view){ + String url = "https://money.yandex.ru/to/410014301951665"; + createOpenBrowserIntent(url); + } + private void createOpenBrowserIntent(String url){ + Intent intent = new Intent(); + intent.setAction(Intent.ACTION_VIEW); + intent.addCategory(Intent.CATEGORY_BROWSABLE); + + intent.setData(Uri.parse(url)); + + startActivity(intent); } } diff --git a/app/src/main/res/drawable/ic_donate_libera.xml b/app/src/main/res/drawable/ic_donate_libera.xml new file mode 100644 index 0000000..5e82655 --- /dev/null +++ b/app/src/main/res/drawable/ic_donate_libera.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_donate_paypal.xml b/app/src/main/res/drawable/ic_donate_paypal.xml new file mode 100644 index 0000000..48cdaf5 --- /dev/null +++ b/app/src/main/res/drawable/ic_donate_paypal.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_donate_yandex.xml b/app/src/main/res/drawable/ic_donate_yandex.xml new file mode 100644 index 0000000..94313ac --- /dev/null +++ b/app/src/main/res/drawable/ic_donate_yandex.xml @@ -0,0 +1,41 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/content_about.xml b/app/src/main/res/layout/content_about.xml index d0f7cde..d820215 100644 --- a/app/src/main/res/layout/content_about.xml +++ b/app/src/main/res/layout/content_about.xml @@ -1,16 +1,9 @@ - - + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + android:orientation="vertical"> - + - + - + - + - + - - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7f0c138..b1023e3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -25,7 +25,7 @@ Автор: Дмитрий Исаенко. Домашняя страница: https://github.com/developersu/ns-usbloader-mobile Переводчики: Если таковые имеются, то все они указаны на домашней странице. - Если вам нравится эта программа, можете поставить звёздочку на GitHub. Донаты по желанию paypal.me/developersu, Яндекс.Деньги. Больше информации на домашней странице. + Если вам нравится эта программа, можете поставить звёздочку на GitHub. Больше информации на домашней странице. Донаты по желанию. Неправильный файл (Передан) (Передача провалилась) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8ef4deb..3f8aec9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -25,7 +25,7 @@ 程式開發: Dmitry Isaenko. 程式首頁: https://github.com/developersu/ns-usbloader-mobile 翻譯人員: 會在程式首頁內提供本程式介面在地化翻譯的人員名單. - 如果本程式對你有助益,請在程式的GitHub頁面上按星號加分,也歡迎贊助我們(金額隨意) paypal.me/developersu, Yandex.Money. More information on home page. + 如果本程式對你有助益,請在程式的GitHub頁面上按星號加分,也歡迎贊助我們(金額隨意) 檔案錯誤 (上傳失敗) (NSP壞檔) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4804573..a3d1b1a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,7 +29,7 @@ Author: Dmitry Isaenko. Home page: https://github.com/developersu/ns-usbloader-mobile Translators: If there are any, they\'re noted on home page. - If you found this application useful, you\'re more than welcome to give a star on GitHub page. Donations (optional) paypal.me/developersu, Yandex.Money. More information on home page. + If you found this application useful, you\'re more than welcome to give a star on GitHub page. More information on home page. Donations (optional): Incorrect file (Upload failure) (Bad NSP)