From 7a0aa23997bf9f938a4f8d3bdfc31de780aea8ab Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <janne@kuschku.de> Date: Fri, 13 Aug 2021 20:49:27 +0200 Subject: [PATCH] Remove donation functionality --- .../ui/clientsettings/about/AboutFragment.kt | 9 ------- .../res/layout/preferences_about_header.xml | 11 -------- .../widget_advertisement_support_patreon.xml | 26 ------------------- app/src/main/res/values-de/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 3 --- app/src/main/res/values-lt/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 3 --- app/src/main/res/values-sr/strings.xml | 2 -- app/src/main/res/values/strings.xml | 3 --- app/src/main/res/xml/preferences.xml | 6 ----- 10 files changed, 68 deletions(-) delete mode 100644 app/src/main/res/layout/widget_advertisement_support_patreon.xml diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt index 313059dba..b0730a2c4 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt @@ -55,9 +55,6 @@ class AboutFragment : DaggerFragment() { @BindView(R.id.action_source) lateinit var source: Button - @BindView(R.id.action_donate) - lateinit var donate: Button - @BindView(R.id.action_privacy_policy) lateinit var privacyPolicy: Button @@ -98,12 +95,6 @@ class AboutFragment : DaggerFragment() { }) } - donate.setOnClickListener { - context?.startActivity(Intent(Intent.ACTION_VIEW).apply { - data = Uri.parse("https://www.patreon.com/justjanne") - }) - } - privacyPolicy.setOnClickListener { context?.startActivity(Intent(Intent.ACTION_VIEW).apply { data = Uri.parse("http://quasseldroid.info/privacy-policy/") diff --git a/app/src/main/res/layout/preferences_about_header.xml b/app/src/main/res/layout/preferences_about_header.xml index b876f7a76..6549ee3ee 100644 --- a/app/src/main/res/layout/preferences_about_header.xml +++ b/app/src/main/res/layout/preferences_about_header.xml @@ -92,17 +92,6 @@ android:layout_height="wrap_content" android:text="@string/label_source" /> - <Space - android:layout_width="8dp" - android:layout_height="wrap_content" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/action_donate" - style="@style/Widget.Button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/advertisement_support_button" /> - </com.google.android.flexbox.FlexboxLayout> <TextView diff --git a/app/src/main/res/layout/widget_advertisement_support_patreon.xml b/app/src/main/res/layout/widget_advertisement_support_patreon.xml deleted file mode 100644 index e952973df..000000000 --- a/app/src/main/res/layout/widget_advertisement_support_patreon.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Quasseldroid - Quassel client for Android - - Copyright (c) 2020 Janne Mareike Koschinski - Copyright (c) 2020 The Quassel Project - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License version 3 as published - by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<de.kuschku.quasseldroid.util.ui.view.BannerView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:buttonText="@string/advertisement_support_button" - app:icon="@drawable/ic_splash" - app:text="@string/advertisement_support_patreon" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 855aef495..4c40ee55b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -212,7 +212,4 @@ Bitte verifiziere vor dem Betreten der Channels und dem Chatten, ob die Channels <string name="cancel_confirmation">Du hast nicht gespeicherte Änderungen. Möchtest du sie verwerfen?</string> <string name="info_copied_version">Version in die Zwischenablage kopiert</string> - - <string name="advertisement_support_patreon">Bitte hilf uns, indem du die Entwicklung dieser App auf Patreon unterstützt</string> - <string name="advertisement_support_button">Entwicklung Unterstützen</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index aee5b598b..eb5257012 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -193,7 +193,4 @@ <string name="cancel_confirmation">Ci sono delle modifiche non salvate. Sei sicuro di voler continuare senza salvarle?</string> <string name="info_copied_version">La versione è stato copiata negli appunti</string> - - <string name="advertisement_support_patreon">Per favore supporta lo sviluppo di questa app su Patreon</string> - <string name="advertisement_support_button">Supporta lo sviluppo</string> </resources> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 9605fc76e..fc32cffa6 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -191,6 +191,4 @@ <string name="cancel_confirmation">Yra neišsaugotų pakeitimų. Ar norite juos panaikinti?</string> <string name="info_copied_version">Versija nukopijuota į atmintinę</string> - - <string name="advertisement_support_patreon">Padėkite mums toliau plėtoti šią programėlę prisidėdami per Patreon</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 47abf6608..95a1b2920 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -193,7 +193,4 @@ <string name="cancel_confirmation">Você tem alterações não guardadas. Você deseja descartá-las?</string> <string name="info_copied_version">Versão copiada para a área de transferência</string> - - <string name="advertisement_support_patreon">Por favor, ajudem a apoiar o desenvolvimento deste aplicativo através de Patreon</string> - <string name="advertisement_support_button">Suporte o desenvolvimento do App</string> </resources> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 80fc018e9..73b248e3a 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -144,6 +144,4 @@ <string name="cancel_confirmation">Imate nesačuvane promene. Da li ih želite odbaciti?</string> <string name="info_copied_version">Verzija kopirana u klipbord</string> - - <string name="advertisement_support_patreon">Molimo Vas da podržite razvoj ove aplikacije na Patreonu</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3697e9ea1..d826045e4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -212,7 +212,4 @@ <string name="cancel_confirmation">You have unsaved changes. Do you wish to discard them?</string> <string name="info_copied_version">Version copied to clipboard</string> - - <string name="advertisement_support_patreon">Please help support the development of this app on Patreon</string> - <string name="advertisement_support_button">Support development</string> </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 5744510bb..18a4e7573 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -21,12 +21,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:robobunny="http://robobunny.com"> - <PreferenceScreen android:layout="@layout/widget_advertisement_support_patreon"> - <intent - android:action="android.intent.action.VIEW" - android:data="https://www.patreon.com/justjanne" /> - </PreferenceScreen> - <PreferenceCategory android:title="@string/preference_appearance_title"> <ListPreference android:defaultValue="MATERIAL_LIGHT" -- GitLab