Merge remote-tracking branch 'origin/master'

AEFeinstein · Mar 31, 2019 · b0710e3 · b0710e3
2 parents 9a19d1c + a347f5b
commit b0710e3
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 168 deletions.
diff --git a/mobile/src/main/java/com/gelakinetic/mtgfam/FamiliarActivity.java b/mobile/src/main/java/com/gelakinetic/mtgfam/FamiliarActivity.java
@@ -154,11 +154,11 @@ public class FamiliarActivity extends AppCompatActivity {
     /* Constants used for saving state */
     private static final String CURRENT_FRAG = "CURRENT_FRAG";
     private static final String IS_REFRESHING = "IS_REFRESHING";
-    /* PayPal URL */
-    @SuppressWarnings("SpellCheckingInspection")
-    public static final String PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations" +
-            "&business=SZK4TAH2XBZNC&lc=US&item_name=MTG%20Familiar&currency_code=USD" +
-            "&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted";
+//    /* PayPal URL */
+//    @SuppressWarnings("SpellCheckingInspection")
+//    public static final String PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations" +
+//            "&business=SZK4TAH2XBZNC&lc=US&item_name=MTG%20Familiar&currency_code=USD" +
+//            "&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted";
     /* Timer to determine user inactivity for screen dimming in the life counter */
     private static final long INACTIVITY_MS = 30000;
     /* Spice setup */
@@ -181,7 +181,7 @@ public class FamiliarActivity extends AppCompatActivity {
             new DrawerEntry(0, 0, true, null),
             new DrawerEntry(R.string.main_settings_title, R.attr.ic_drawer_settings, false, null),
             new DrawerEntry(R.string.main_force_update_title, R.attr.ic_drawer_download, false, null),
-            new DrawerEntry(R.string.main_donate_title, R.attr.ic_drawer_good, false, null),
+//            new DrawerEntry(R.string.main_donate_title, R.attr.ic_drawer_good, false, null),
             new DrawerEntry(R.string.main_about, R.attr.ic_drawer_about, false, null),
             new DrawerEntry(R.string.main_whats_new_title, R.attr.ic_drawer_help, false, null),
             new DrawerEntry(R.string.main_export_data_title, R.attr.ic_drawer_save, false, null),
@@ -621,11 +621,11 @@ public void onStart() {
                     shouldCloseDrawer = true;
                     break;
                 }
-                case R.string.main_donate_title: {
-                    showDialogFragment(FamiliarActivityDialogFragment.DIALOG_DONATE);
-                    shouldCloseDrawer = true;
-                    break;
-                }
+//                case R.string.main_donate_title: {
+//                    showDialogFragment(FamiliarActivityDialogFragment.DIALOG_DONATE);
+//                    shouldCloseDrawer = true;
+//                    break;
+//                }
                 case R.string.main_about: {
                     showDialogFragment(FamiliarActivityDialogFragment.DIALOG_ABOUT);
                     shouldCloseDrawer = true;
@@ -734,7 +734,7 @@ public void onDrawerSlide(View drawerView, float slideOffset) {
                             !(lastVersion == 54 && pInfo.versionCode == 55) && // Don't show 54 -> 55, it was just a quick bugfix release
                             !(lastVersion == 55 && pInfo.versionCode == 56) && // Don't show 55 -> 56, it was just a quick bugfix release
                             !(lastVersion == 56 && pInfo.versionCode == 57)    // Don't show 56 -> 57, it was just a quick bugfix release
-                            ) {
+                    ) {
                         showDialogFragment(FamiliarActivityDialogFragment.DIALOG_CHANGE_LOG);
                     }
 

diff --git a/...rc/main/java/com/gelakinetic/mtgfam/fragments/dialogs/FamiliarActivityDialogFragment.java b/...rc/main/java/com/gelakinetic/mtgfam/fragments/dialogs/FamiliarActivityDialogFragment.java
@@ -53,7 +53,7 @@ public class FamiliarActivityDialogFragment extends FamiliarDialogFragment {
     /* Constants used for displaying dialogs */
     public static final int DIALOG_ABOUT = 100;
     public static final int DIALOG_CHANGE_LOG = 101;
-    public static final int DIALOG_DONATE = 102;
+//    public static final int DIALOG_DONATE = 102;
     public static final int DIALOG_TTS = 103;
 
     /**
@@ -128,42 +128,42 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
                 return builder.build();
             }
-            case DIALOG_DONATE: {
-                /* Set the title */
-                builder.title(R.string.main_donate_dialog_title);
-                /* Set the buttons button */
-                builder.negativeText(R.string.dialog_thanks_anyway);
-
-                builder.positiveText(R.string.main_donate_title);
-                builder.onPositive((dialog, which) -> {
-                    Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(FamiliarActivity.PAYPAL_URL));
-                    startActivity(myIntent);
-                });
-
-                /* Set the custom view */
-                LayoutInflater inflater = this.getActivity().getLayoutInflater();
-                @SuppressLint("InflateParams") View dialogLayout = inflater.inflate(R.layout.activity_dialog_about, null, false);
-
-                /* Set the text */
-                assert dialogLayout != null;
-                TextView text = dialogLayout.findViewById(R.id.aboutfield);
-                text.setText(ImageGetterHelper.formatHtmlString(getString(R.string.main_donate_text)));
-                text.setMovementMethod(LinkMovementMethod.getInstance());
-
-                /* Set the image view */
-                ImageView payPal = dialogLayout.findViewById(R.id.imageview1);
-                payPal.setImageResource(R.drawable.paypal_icon);
-                payPal.setOnClickListener(v -> {
-                    Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri
-                            .parse(FamiliarActivity.PAYPAL_URL));
-
-                    startActivity(myIntent);
-                });
-                dialogLayout.findViewById(R.id.imageview2).setVisibility(View.GONE);
-
-                builder.customView(dialogLayout, false);
-                return builder.build();
-            }
+//            case DIALOG_DONATE: {
+//                /* Set the title */
+//                builder.title(R.string.main_donate_dialog_title);
+//                /* Set the buttons button */
+//                builder.negativeText(R.string.dialog_thanks_anyway);
+//
+//                builder.positiveText(R.string.main_donate_title);
+//                builder.onPositive((dialog, which) -> {
+//                    Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(FamiliarActivity.PAYPAL_URL));
+//                    startActivity(myIntent);
+//                });
+//
+//                /* Set the custom view */
+//                LayoutInflater inflater = this.getActivity().getLayoutInflater();
+//                @SuppressLint("InflateParams") View dialogLayout = inflater.inflate(R.layout.activity_dialog_about, null, false);
+//
+//                /* Set the text */
+//                assert dialogLayout != null;
+//                TextView text = dialogLayout.findViewById(R.id.aboutfield);
+//                text.setText(ImageGetterHelper.formatHtmlString(getString(R.string.main_donate_text)));
+//                text.setMovementMethod(LinkMovementMethod.getInstance());
+//
+//                /* Set the image view */
+//                ImageView payPal = dialogLayout.findViewById(R.id.imageview1);
+//                payPal.setImageResource(R.drawable.paypal_icon);
+//                payPal.setOnClickListener(v -> {
+//                    Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri
+//                            .parse(FamiliarActivity.PAYPAL_URL));
+//
+//                    startActivity(myIntent);
+//                });
+//                dialogLayout.findViewById(R.id.imageview2).setVisibility(View.GONE);
+//
+//                builder.customView(dialogLayout, false);
+//                return builder.build();
+//            }
             case DIALOG_TTS: {
                 /* Then display a dialog informing them of TTS */
 

diff --git a/mobile/src/main/res/values-de/strings.xml b/mobile/src/main/res/values-de/strings.xml
@@ -11,7 +11,7 @@
 <string name="dialog_both">"Beide"</string>
 <string name="dialog_life">"Leben"</string>
 <string name="dialog_thanks">"Danke!"</string>
-<string name="dialog_thanks_anyway">"Trotzdem danke!"</string>
+<!-- <string name="dialog_thanks_anyway">"Trotzdem danke!"</string> -->
 <string name="dialog_enjoy">"Viel Spaß!"</string>
 <string name="update_notification">"Prüfe Datenbank auf Aktualisierungen"</string>
 <string name="update_updating_set">"Füge %s hinzu"</string>
@@ -51,23 +51,23 @@
 <string name="main_decklist">"Deckbauer"</string>
 <string name="main_force_update_title">"Aktualisierung erzwingen"</string>
 <string name="main_settings_title">"Einstellungen"</string>
-<string name="main_donate_title">"Spenden"</string>
-<string name="main_donate_dialog_title">"Spende an die Entwickler"</string>
+<!-- <string name="main_donate_title">"Spenden"</string> -->
+<!-- <string name="main_donate_dialog_title">"Spende an die Entwickler"</string> -->
 <string name="main_profile">"Profil"</string>
 
 <!-- Some grammar corrections and changes to the overall tone. What do you mean with "We've got a drafting habit to fuel, OK?" Are you referring to drafting as a playmode Magic? How does this fit into the text? -->
-<string name="main_donate_text">"Wie viel würdest du für eine Premium-MTG-App wie diese bezahlen? $1,000? $10,000?&lt;br&gt;
-&lt;br&gt;
-Wenn du das hier liest, weißt du ja bereits, dass wir sie kostenfrei bereit stellen!&lt;br&gt;
-&lt;br&gt;
-Programmieren ist dennoch harte Arbeit und wir Entwickler freuen uns über jeden Cent.&lt;br&gt;
-&lt;br&gt;
-Wir brauchen schließlich auch Geld zum draften:)&lt;br&gt;
-&lt;br&gt;
-Du kannst die Schaltfläche unten drücken, um über Paypal zu spenden. $1 ist gut. $5 sind besser. Und so weiter…&lt;br&gt;
-&lt;br&gt;
-Also, wie großzügig bist du heute?
-"</string>
+<!--<string name="main_donate_text">"Wie viel würdest du für eine Premium-MTG-App wie diese bezahlen? $1,000? $10,000?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Wenn du das hier liest, weißt du ja bereits, dass wir sie kostenfrei bereit stellen!&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Programmieren ist dennoch harte Arbeit und wir Entwickler freuen uns über jeden Cent.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Wir brauchen schließlich auch Geld zum draften:)&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Du kannst die Schaltfläche unten drücken, um über Paypal zu spenden. $1 ist gut. $5 sind besser. Und so weiter…&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Also, wie großzügig bist du heute?-->
+<!--"</string>-->
 <string name="main_whats_new_title">"Neuerungen"</string>
 <string name="main_whats_new_in_title">"Neuerungen in Version"</string>
 

diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
@@ -11,7 +11,7 @@
 <string name="dialog_both">"Ambos"</string>
 <string name="dialog_life">"Vida"</string>
 <string name="dialog_thanks">"¡Gracias!"</string>
-<string name="dialog_thanks_anyway">"¡Gracias igualmente!"</string>
+<!-- <string name="dialog_thanks_anyway">"¡Gracias igualmente!"</string> -->
 
 <!-- I'd like to know where this appears. Just to make sure it's OK. -->
 <string name="dialog_enjoy">"¡Genial!"</string>
@@ -47,21 +47,21 @@
 <string name="main_decklist">"Constructor de mazos"</string>
 <string name="main_force_update_title">"Forzar actualización"</string>
 <string name="main_settings_title">"Ajustes"</string>
-<string name="main_donate_title">"Donar"</string>
-<string name="main_donate_dialog_title">"Donar a los desarrolladores"</string>
+<!-- <string name="main_donate_title">"Donar"</string> -->
+<!-- <string name="main_donate_dialog_title">"Donar a los desarrolladores"</string> -->
 <string name="main_profile">"Perfil"</string>
-<string name="main_donate_text">"¿Cuánto pagarías por una excelente aplicación de Magic como esta? ¿1000€? ¿10000€?&lt;br&gt;
-&lt;br&gt;
-Bueno, si estás leyendo esto, entonces ya sabes que la estamos dando totalmente gratis.&lt;br&gt;
-&lt;br&gt;
-Escribir código es un duro trabajo y nosotros, los desarrolladores, apreciamos cualquier euro que recibamos.&lt;br&gt;
-&lt;br&gt;
-Tenemos una adicción a los drafts que mantener, ¿vale?&lt;br&gt;
-&lt;br&gt;
-Puedes pulsar el botón de abajo y donar a través de Paypal. 1€ está bien, 5€ están mejor. Ya me entiendes.&lt;br&gt;
-&lt;br&gt;
-Así que, ¿cómo vas hoy de generosidad?
-"</string>
+<!--<string name="main_donate_text">"¿Cuánto pagarías por una excelente aplicación de Magic como esta? ¿1000€? ¿10000€?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Bueno, si estás leyendo esto, entonces ya sabes que la estamos dando totalmente gratis.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Escribir código es un duro trabajo y nosotros, los desarrolladores, apreciamos cualquier euro que recibamos.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Tenemos una adicción a los drafts que mantener, ¿vale?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Puedes pulsar el botón de abajo y donar a través de Paypal. 1€ está bien, 5€ están mejor. Ya me entiendes.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Así que, ¿cómo vas hoy de generosidad?-->
+<!--"</string>-->
 <string name="main_whats_new_title">"Novedades"</string>
 <string name="main_whats_new_in_title">"Novedades de la versión"</string>
 <string name="main_tts_warning_title">"Síntesis de voz (Text-to-Speech)"</string>

diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
@@ -11,7 +11,7 @@
 <string name="dialog_both">"Joueurs &amp; Vie"</string>
 <string name="dialog_life">"Que Vie"</string>
 <string name="dialog_thanks">"Merci!"</string>
-<string name="dialog_thanks_anyway">"Merci quand même!"</string>
+<!-- <string name="dialog_thanks_anyway">"Merci quand même!"</string> -->
 <string name="dialog_enjoy">"Amusez-vous!"</string>
 <string name="update_notification">"Recherche de mise à jour des données"</string>
 <string name="update_updating_set">"Ajout de %s…"</string>
@@ -45,21 +45,21 @@
 <string name="main_decklist">"Concepteur de Deck"</string>
 <string name="main_force_update_title">"Forcer la mise à jour"</string>
 <string name="main_settings_title">"Paramètres"</string>
-<string name="main_donate_title">"Faire un don"</string>
-<string name="main_donate_dialog_title">"Don aux créateurs"</string>
+<!-- <string name="main_donate_title">"Faire un don"</string> -->
+<!-- <string name="main_donate_dialog_title">"Don aux créateurs"</string> -->
 <string name="main_profile">"Profile"</string>
-<string name="main_donate_text">"Pour une appli MTG premium comme celle-ci, combien paieriez-vous ? 1 000 €? 10 000 €?&lt;br&gt;
-&lt;br&gt;
-Bon, si vous lisez ceci, vous savez déjà qu'on la distribue gratuitement!&lt;br&gt;
-&lt;br&gt;
-Coder est un travail difficile, et nous développeurs appréciont les euros bonus ici ou là.&lt;br&gt;
-&lt;br&gt;
-Nous avons une passion du draft à alimenter, ok?&lt;br&gt;
-&lt;br&gt;
-Vous pouvez cliquer sur le bouton ci-dessous pour faire un don via PayPal. 1€ c'est cool, 5€ ça l'est encore plus. A vous de choisir.&lt;br&gt;
-&lt;br&gt;
-Alors, à quel point vous sentez-vous généreux aujourd'hui?
-"</string>
+<!--<string name="main_donate_text">"Pour une appli MTG premium comme celle-ci, combien paieriez-vous ? 1 000 €? 10 000 €?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Bon, si vous lisez ceci, vous savez déjà qu'on la distribue gratuitement!&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Coder est un travail difficile, et nous développeurs appréciont les euros bonus ici ou là.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Nous avons une passion du draft à alimenter, ok?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Vous pouvez cliquer sur le bouton ci-dessous pour faire un don via PayPal. 1€ c'est cool, 5€ ça l'est encore plus. A vous de choisir.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Alors, à quel point vous sentez-vous généreux aujourd'hui?-->
+<!--"</string>-->
 <string name="main_whats_new_title">"Nouveautés"</string>
 <string name="main_whats_new_in_title">"Nouveautés dans la Version"</string>
 <string name="main_tts_warning_title">"Synthèse vocale (TTS)"</string>

diff --git a/mobile/src/main/res/values-it/strings.xml b/mobile/src/main/res/values-it/strings.xml
@@ -11,7 +11,7 @@
 <string name="dialog_both">"Entrambi"</string>
 <string name="dialog_life">"Vita"</string>
 <string name="dialog_thanks">"Grazie!"</string>
-<string name="dialog_thanks_anyway">"Grazie comunque!"</string>
+<!-- <string name="dialog_thanks_anyway">"Grazie comunque!"</string> -->
 <string name="dialog_enjoy">"Divertiti!"</string>
 <string name="update_notification">"Sto controllando gli aggiornamenti del database"</string>
 <string name="update_updating_set">"Sto aggiungendo %s"</string>
@@ -47,21 +47,21 @@
 <string name="main_decklist">"Deck Builder"</string>
 <string name="main_force_update_title">"Forza aggiornamento"</string>
 <string name="main_settings_title">"Impostazioni"</string>
-<string name="main_donate_title">"Dona"</string>
-<string name="main_donate_dialog_title">"Fai una donazione agli sviluppatori"</string>
+<!-- <string name="main_donate_title">"Dona"</string> -->
+<!-- <string name="main_donate_dialog_title">"Fai una donazione agli sviluppatori"</string> -->
 <string name="main_profile">"Profilo"</string>
-<string name="main_donate_text">"Quanto pagheresti per un'eccellente applicazione di MTG come questa? $1,000? $10,000?&lt;br&gt;
-&lt;br&gt;
-Beh, se stai leggendo questo avviso, sai anche che la stiamo regalando!&lt;br&gt;
-&lt;br&gt;
-Programmare è un duro lavoro, e noi sviluppatori apprezziamo i dollari extra qui o là.&lt;br&gt;
-&lt;br&gt;
-Abbiamo l'abitudine di nutrirci, OK?&lt;br&gt;
-&lt;br&gt;
-Puoi toccare il bottone qua sotto per donare via PayPal. $1 è figo. $5 è più figo. La scelta è tua.&lt;br&gt;
-&lt;br&gt;
-Quindi, quanto ti senti generoso oggi?
-"</string>
+<!--<string name="main_donate_text">"Quanto pagheresti per un'eccellente applicazione di MTG come questa? $1,000? $10,000?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Beh, se stai leggendo questo avviso, sai anche che la stiamo regalando!&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Programmare è un duro lavoro, e noi sviluppatori apprezziamo i dollari extra qui o là.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Abbiamo l'abitudine di nutrirci, OK?&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Puoi toccare il bottone qua sotto per donare via PayPal. $1 è figo. $5 è più figo. La scelta è tua.&lt;br&gt;-->
+<!--&lt;br&gt;-->
+<!--Quindi, quanto ti senti generoso oggi?-->
+<!--"</string>-->
 <string name="main_whats_new_title">"Novità"</string>
 <string name="main_whats_new_in_title">"Novità in questa versione"</string>
 <string name="main_tts_warning_title">"Sintetizzatore vocale (TTS)"</string>