Moved donate link to app settings.

src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java

@@ -1,7 +1,6 @@
 package com.nutomic.syncthingandroid.fragments;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -21,8 +20,6 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static android.content.Intent.ACTION_VIEW;
-
 /**
  * Displays information about the local device.
  */
@@ -94,8 +91,6 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
                 .setOnClickListener(this);
         view.findViewById(R.id.drawerActionShareId)
                 .setOnClickListener(this);
-        view.findViewById(R.id.drawerActionDonate)
-                .setOnClickListener(this);
         view.findViewById(R.id.drawerActionRestart)
                 .setOnClickListener(this);
         view.findViewById(R.id.drawerActionSettings)
@@ -195,11 +190,6 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
                 startActivity(Intent.createChooser(i, "Share device ID with"));
                 mActivity.closeDrawer();
                 break;
-            case R.id.drawerActionDonate:
-                startActivity(new Intent(ACTION_VIEW, Uri.parse(
-                        getString(R.string.donate_url))));
-                mActivity.closeDrawer();
-                break;
             case R.id.drawerActionSettings:
                 startActivity(new Intent(mActivity, SettingsActivity.class)
                         .setAction(SettingsActivity.ACTION_APP_SETTINGS));

src/main/res/layout/fragment_drawer.xml

@@ -228,15 +228,6 @@
                 android:drawableStart="@drawable/ic_share_black_24dp"
                 android:text="@string/share_device_id" />
 
-            <TextView
-                android:id="@+id/drawerActionDonate"
-                style="@style/Widget.Syncthing.TextView.Label"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:drawableLeft="@drawable/ic_attach_money_black_24dp"
-                android:drawableStart="@drawable/ic_attach_money_black_24dp"
-                android:text="@string/donate" />
-
             <TextView
                 android:id="@+id/drawerActionRestart"
                 style="@style/Widget.Syncthing.TextView.Label"

src/main/res/values-bg/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Сървър за откриване на устройства</string>
   <!--Menu item to donate-->
-  <string name="donate">Дарете</string>
+  <string name="donate_title">Дарете</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Идентификатор на папката</string>

src/main/res/values-cs/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Globální oznamování</string>
   <!--Menu item to donate-->
-  <string name="donate">Přispět</string>
+  <string name="donate_title">Přispět</string>
   <string name="restart">Restart</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

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

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Indexserver</string>
   <!--Menu item to donate-->
-  <string name="donate">Spenden</string>
+  <string name="donate_title">Spenden</string>
   <string name="restart">Neustart</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-es/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de Anuncio</string>
   <!--Menu item to donate-->
-  <string name="donate">Donar</string>
+  <string name="donate_title">Donar</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID de carpeta</string>

src/main/res/values-fr/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Serveur d\'annonce</string>
   <!--Menu item to donate-->
-  <string name="donate">Faire un don</string>
+  <string name="donate_title">Faire un don</string>
   <string name="restart">Redémarrer</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-hu/strings.xml

@@ -47,7 +47,7 @@
   <string name="ram_usage">Memória használat</string>
   <!--Title for announce server status-->
   <!--Menu item to donate-->
-  <string name="donate">Támogatás</string>
+  <string name="donate_title">Támogatás</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Mappa azonosító</string>

src/main/res/values-in/strings.xml

@@ -46,7 +46,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Server Penyiaran</string>
   <!--Menu item to donate-->
-  <string name="donate">Donasi</string>
+  <string name="donate_title">Donasi</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID Folder</string>

src/main/res/values-it/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Server Presenza Globale</string>
   <!--Menu item to donate-->
-  <string name="donate">Donazione</string>
+  <string name="donate_title">Donazione</string>
   <string name="restart">Riavvia ora</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-ja/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">アナウンスサーバー</string>
   <!--Menu item to donate-->
-  <string name="donate">寄付</string>
+  <string name="donate_title">寄付</string>
   <string name="restart">再起動</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-ko/strings.xml

@@ -43,7 +43,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">익명 서버</string>
   <!--Menu item to donate-->
-  <string name="donate">기부하기</string>
+  <string name="donate_title">기부하기</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">폴더 ID</string>

src/main/res/values-nb/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Søketjener</string>
   <!--Menu item to donate-->
-  <string name="donate">Donér</string>
+  <string name="donate_title">Donér</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Mappe-ID</string>

src/main/res/values-nl/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Mededelingsserver</string>
   <!--Menu item to donate-->
-  <string name="donate">Doneren</string>
+  <string name="donate_title">Doneren</string>
   <string name="restart">Herstarten</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-pl/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Serwer ogłoszeniowy</string>
   <!--Menu item to donate-->
-  <string name="donate">Wspomóż</string>
+  <string name="donate_title">Wspomóż</string>
   <string name="restart">Uruchom ponownie</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-pt-rBR/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de busca global</string>
   <!--Menu item to donate-->
-  <string name="donate">Doações</string>
+  <string name="donate_title">Doações</string>
   <string name="restart">Reiniciar</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-pt/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de busca global</string>
   <!--Menu item to donate-->
-  <string name="donate">Doar</string>
+  <string name="donate_title">Doar</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID da pasta</string>

src/main/res/values-ru/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Сервера анонсов</string>
   <!--Menu item to donate-->
-  <string name="donate">Пожертвовать</string>
+  <string name="donate_title">Пожертвовать</string>
   <string name="restart">Перезагрузить</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-sk/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Ohlasovací server</string>
   <!--Menu item to donate-->
-  <string name="donate">Prispieť</string>
+  <string name="donate_title">Prispieť</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID adresára</string>

src/main/res/values-tr/strings.xml

@@ -50,7 +50,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Bildirim Sunucusu</string>
   <!--Menu item to donate-->
-  <string name="donate">Bağış yap</string>
+  <string name="donate_title">Bağış yap</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Klasör ID</string>

src/main/res/values-vi/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Máy chủ thông báo</string>
   <!--Menu item to donate-->
-  <string name="donate">Quyên góp</string>
+  <string name="donate_title">Quyên góp</string>
   <string name="restart">Khởi chạy lại</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values-zh-rCN/strings.xml

@@ -52,7 +52,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">宣告服务器</string>
   <!--Menu item to donate-->
-  <string name="donate">捐赠</string>
+  <string name="donate_title">捐赠</string>
   <string name="restart">重启</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->

src/main/res/values/strings.xml

@@ -92,11 +92,6 @@
     <!-- Title for announce server status -->
     <string name="announce_server">Announce Server</string>
 
-    <!-- Menu item to donate -->
-    <string name="donate">Donate</string>
-
-    <string name="donate_url" translatable="false">https://syncthing.net/#donate</string>
-
     <string name="restart">Restart</string>
 
     <!-- FolderSettingsFragment -->
@@ -351,6 +346,14 @@ Please report any problems you encounter via Github.</string>
     <!-- URL of the issue tracker -->
     <string name="issue_tracker_url" translatable="false">https://github.com/Nutomic/syncthing-android/issues</string>
 
+
+    <!-- Menu item to donate -->
+    <string name="donate_title">Donate</string>
+
+    <string name="donate_summary">Help us pay for domains and hosting fees</string>
+
+    <string name="donate_url" translatable="false">https://syncthing.net/#donate</string>
+
     <!-- Title of the preference showing upstream version name -->
     <string name="syncthing_version_title">Syncthing Version</string>
 

src/main/res/xml/app_settings.xml

@@ -179,6 +179,14 @@
                 android:data="@string/issue_tracker_url" />
         </Preference>
 
+        <Preference
+            android:title="@string/donate_title"
+            android:summary="@string/donate_summary">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="@string/donate_url" />
+        </Preference>
+
         <Preference
             android:key="syncthing_version"
             android:title="@string/syncthing_version_title"