Merge pull request #1216 from jsrck/315-recommend

Enhance recommend to a friend #315

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -416,16 +416,19 @@ public class Preferences extends PreferenceActivity
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
 
-                        Intent intent = new Intent(Intent.ACTION_SENDTO);
+                        Intent intent = new Intent(Intent.ACTION_SEND);
                         intent.setType("text/plain");
-                        intent.setData(Uri.parse(getString(R.string.mail_recommend)));
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
                         String appName = getString(R.string.app_name);
-                        String downloadUrl = getString(R.string.url_app_download);
+                        String downloadUrlGooglePlayStore = getString(R.string.url_app_download);
+                        String downloadUrlFDroid = getString(R.string.fdroid_link);
+                        String downloadUrls = String.format(getString(R.string.recommend_urls),
+                                downloadUrlGooglePlayStore, downloadUrlFDroid);
 
                         String recommendSubject = String.format(getString(R.string.recommend_subject), appName);
-                        String recommendText = String.format(getString(R.string.recommend_text), appName, downloadUrl);
+                        String recommendText = String.format(getString(R.string.recommend_text),
+                                appName, downloadUrls);
 
                         intent.putExtra(Intent.EXTRA_SUBJECT, recommendSubject);
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);

src/main/res/layout/simple_dialog_list_item.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:textColor="@color/dialog_list_item"
-    android:textSize="@dimen/two_line_primary_text_size"
-    android:gravity="center_vertical"
-    android:paddingLeft="@dimen/standard_padding"
-    android:paddingRight="@dimen/standard_padding"
-    android:minHeight="@dimen/simple_dialog_list_item_layout_size"/>

src/main/res/values/colors.xml

@@ -24,24 +24,16 @@
     <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
-    <color name="white2">#F7F7F7</color>
     <color name="fab_white">#fafafa</color>
-    <color name="white_pressed">#f1f1f1</color>
-    <color name="half_black">#808080</color>
     <color name="black_semi_transparent">#B2000000</color>
     <color name="textColor">@color/black</color>
-    <color name="drawerMenuTextColor">#000000</color>
     <color name="list_divider_background">#eee</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
-    <color name="secondary_button_color">#D6D7D7</color>
     <color name="transparent">#00000000</color>
     <color name="secondaryTextColor">#a0a0a0</color>
-    <color name="listItemHighlighted">#f8f8f8</color>
-    <color name="highlightTextColor">#55739a</color>
 
     <!-- Colors -->
-    <color name="dialog_list_item">#1F1F1F</color>
     <color name="standard_grey">#757575</color>
 
     <!-- standard material color definitions -->

src/main/res/values/setup.xml

@@ -105,7 +105,6 @@
     <bool name="feedback_enabled">true</bool>
     <bool name="logger_enabled">false</bool>
     <string name="url_imprint"></string>
-    <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
     <string name="url_server_install">https://nextcloud.com/install</string>

src/main/res/values/strings.xml

@@ -69,6 +69,7 @@
 
 	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
 	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone.\nDownload here: %2$s"</string>
+    <string name="recommend_urls">"%1$s or %2$s"</string>
 
     <string name="auth_check_server">Check server</string>
     <string name="auth_host_url">Server address https://…</string>