updated license dialog, removed help dialog

app/src/main/java/de/baumann/diaspora/MainActivity.java

@@ -991,7 +991,7 @@ public class MainActivity extends AppCompatActivity
             break;
 
             case R.id.nav_license_help: {
-                final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help), getString(R.string.help_donate)};
+                final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help)};
                 new AlertDialog.Builder(MainActivity.this)
                         .setItems(options, new DialogInterface.OnClickListener() {
                             @Override
@@ -1037,24 +1037,6 @@ public class MainActivity extends AppCompatActivity
                                                         }
                                                     }).show();
                                 }
-                                if (options[item].equals(getString(R.string.help_donate))) {
-                                    new AlertDialog.Builder(MainActivity.this)
-                                            .setMessage(getString(R.string.donate_text))
-                                            .setPositiveButton(getString(R.string.yes),
-                                                    new DialogInterface.OnClickListener() {
-                                                        public void onClick(DialogInterface dialog, int id) {
-                                                            dialog.cancel();
-                                                        }
-                                                    })
-                                            .setNegativeButton(getString(R.string.donate_1),
-                                                    new DialogInterface.OnClickListener() {
-                                                        public void onClick(DialogInterface dialog, int id) {
-                                                            Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("http://martinv.tip.me/"));
-                                                            startActivity(i);
-                                                            dialog.cancel();
-                                                        }
-                                                    }).show();
-                                }
                             }
                         }).show();
             }

app/src/main/res/values-de/strings.xml

@@ -121,10 +121,10 @@
         <b>Sonderzeichen</b><br>
         Du kannst Symbole und Sonderzeichen nutzen, indem du bestimmte Zeichenfolgen verwendest. Z.B.:<br>
         (c) = © ; (r) = ® ; x^2 = x²"</string>
-    <string name="license_text">&lt;i>Zuerst einmal: ich bin kein Entwickler. Ich verstehe ein paar Grundlagen, aber das Meiste meiner
+    <string name="license_text">&lt;b>Beteiligte:&lt;/b>&lt;br>
-        Arbeit ist mit \"Copy and Paste\" passiert. Diese App ist ein Fork der original \"DiasporaNativeWebApp\"
+
-        von \"martinchodev\" (der die allermeiste Arbeit erledigt hat -> mein großer Dank gilt ihm), welche unter der GPL-Lizenz
+        &#8226; de-live-gdev https://de-live-gdev.github.io&lt;br>
-        veröffentlicht wurde.&lt;/i> &lt;br> &lt;br>
+        &#8226; scoute-dich https://github.com/scoute-dich&lt;br> &lt;br>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -139,15 +139,12 @@ 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.&lt;br> &lt;br>
 
-        &lt;i>Die Bilder des Startbildschirms können auf Flickr gefunden werden:
+        &lt;i>Die App ist ein Fork von \"DiasporaNativeWebApp\"
+        von \"martinchodev\". Die Bilder des Startbildschirms können auf Flickr gefunden werden:
         https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
         Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.&lt;/i></string>
     <string name="fab2_title_person">Suche nach Personen …</string>
     <string name="fab2_title_tag">Suche nach Tags …</string>
-    <string name="donate_1">per Bitcoin</string>
-    <string name="donate_text">Wenn dir die App gefällt, kannst du dem Entwickler der original \"DiasporaNativeWebApp\"
-        eine Kleinigkeit spenden:</string>
-    <string name="help_donate">Spenden</string>
     <string name="splash_screen_description">Startbildschirm</string>
     <string name="new_conversations">Ungelesene Unterhaltung. Öffnen?</string>
     <string name="new_notifications">Ungelesene Benachrichtigung. Lesen?</string>

app/src/main/res/values/strings.xml

@@ -69,7 +69,6 @@
 
     <string name="help_license">License</string>
     <string name="help_help">Markdown formating</string>
-    <string name="help_donate">Donate</string>
     <string name="help_about">Changelog</string>
 
     <string name="toast_screenshot">Taking screenshot …</string>
@@ -131,9 +130,6 @@
         You can create the following symbols and other special characters using a combination of characters:&lt;br>
         (c) = © ; (r) = ® ; x^2 = x²"</string>
 
-    <string name="donate_text">If you like the app fell free to donate to the devoloper of the original \"DiasporaNativeWebApp\":</string>
-    <string name="donate_1">Via Bitcoin</string>
-
     <string name="about_text" translatable="false">
         &lt;i>For more informations visit the Projectsite on github:&lt;br>
         https://github.com/scoute-dich/Diaspora&lt;/i>&lt;br>&lt;br>
@@ -167,10 +163,11 @@
         &#8226; implemented swipe to refresh
     </string>
 
-    <string name="license_title" translatable="false">Copyright © 2016  by scoute-dich</string>
+    <string name="license_title" translatable="false">Copyright © 2016</string>
-    <string name="license_text">&lt;i>First of all: I am not a developer. I understand a few basics and most of my work is done
+    <string name="license_text">&lt;b>Contributors:&lt;/b>&lt;br>
-        by copy and paste. This app is a fork of the original \"DiasporaNativeWebApp\"
+
-        from \"martinchodev\" (who did most of the work -> big thanks to him), which is released under the GPL-license.&lt;/i> &lt;br> &lt;br>
+        &#8226; de-live-gdev https://de-live-gdev.github.io&lt;br>
+        &#8226; scoute-dich https://github.com/scoute-dich&lt;br> &lt;br>
 
         This program is free software: you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
@@ -185,7 +182,8 @@
         You should have received a copy of the GNU General Public License
         along with this program.  If not, see http://www.gnu.org/licenses.&lt;br> &lt;br>
 
-        &lt;i>The splashscreen images can be found on flickr:
+        &lt;i>This app is a fork of the original \"DiasporaNativeWebApp\"
+        from \"martinchodev\". The splashscreen images can be found on flickr:
         https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
         They were published by \"Lydia\" and are licensed under cc by-nc-sa.&lt;/i></string>