Merge pull request #4446 from rajput2122/master

Feedback link is removed from setting ang participate is changed to c…

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

@@ -323,8 +323,6 @@ public class SettingsActivity extends PreferenceActivity
 
         setupRecommendPreference(preferenceCategoryMore);
 
-        setupFeedbackPreference(appVersion, preferenceCategoryMore);
-
         setupLoggingPreference(preferenceCategoryMore);
 
         setupImprintPreference(preferenceCategoryMore);
@@ -372,31 +370,7 @@ public class SettingsActivity extends PreferenceActivity
         }
     }
 
-    private void setupFeedbackPreference(String appVersion, PreferenceCategory preferenceCategoryMore) {
-        boolean feedbackEnabled = getResources().getBoolean(R.bool.feedback_enabled);
-        Preference pFeedback = findPreference("feedback");
-        if (pFeedback != null) {
-            if (feedbackEnabled) {
-                pFeedback.setOnPreferenceClickListener(preference -> {
-                    String feedback = getText(R.string.prefs_feedback) + " - android v" + appVersion;
-                    Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "", null));
-                    intent.putExtra(Intent.EXTRA_EMAIL, new String[]{getString(R.string.mail_feedback)});
-                    intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                    if (intent.resolveActivity(getPackageManager()) != null) {
-                        startActivity(intent);
-                    } else {
-                        DisplayUtils.showSnackMessage(this, R.string.feedback_no_mail_app);
-                    }
 
-                    return true;
-                });
-            } else {
-                preferenceCategoryMore.removePreference(pFeedback);
-            }
-        }
-    }
 
     private void setupRecommendPreference(PreferenceCategory preferenceCategoryMore) {
         boolean recommendEnabled = getResources().getBoolean(R.bool.recommend_enabled);

src/main/res/layout/participate_layout.xml

@@ -78,12 +78,52 @@
                     android:text="@string/participate_testing_version_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"/>
 
+                <TextView
+                    android:id="@+id/participate_contribute_headline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/standard_padding"
+                    android:text="@string/participate_contribute_headline"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView
+                    android:id="@+id/participate_contribute_irc_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/participate_contribute_irc_text"
+                    android:paddingBottom="@dimen/standard_quarter_padding"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <TextView
+                    android:id="@+id/participate_contribute_forum_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/participate_contribute_forum_text"
+                    android:paddingBottom="@dimen/standard_quarter_padding"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <TextView
+                    android:id="@+id/participate_contribute_translate_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/participate_contribute_translate_text"
+                    android:paddingBottom="@dimen/standard_quarter_padding"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <TextView
+                    android:id="@+id/participate_contribute_github_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/participate_contribute_github_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
                 <TextView
                     android:id="@+id/participate_release_candidate_headline"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/standard_padding"
                     android:text="@string/participate_release_candidate_headline"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView
                     android:id="@+id/participate_release_candidate_text"
@@ -122,8 +162,9 @@
                     android:id="@+id/participate_beta_headline"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/standard_padding"
                     android:text="@string/participate_beta_headline"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView
                     android:id="@+id/participate_beta_text"
@@ -158,43 +199,9 @@
 
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/participate_contribute_headline"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_headline"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                <TextView
-                    android:id="@+id/participate_contribute_irc_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_irc_text"
-                    android:paddingBottom="@dimen/standard_quarter_padding"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-                <TextView
-                    android:id="@+id/participate_contribute_forum_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_forum_text"
-                    android:paddingBottom="@dimen/standard_quarter_padding"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-                <TextView
-                    android:id="@+id/participate_contribute_translate_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_translate_text"
-                    android:paddingBottom="@dimen/standard_quarter_padding"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-                <TextView
-                    android:id="@+id/participate_contribute_github_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_github_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
             </LinearLayout>
         </ScrollView>
 

src/main/res/values/strings.xml

@@ -55,7 +55,6 @@
     <string name="prefs_daily_contacts_sync_summary">Daily backup of your contacts</string>
     <string name="prefs_help">Help</string>
     <string name="prefs_recommend">Recommend to friend</string>
-    <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
 
     <string name="recommend_subject">Try %1$s on your device!</string>
@@ -527,7 +526,7 @@
     <string name="files_drop_not_supported">This is a Nextcloud feature, please upgrade.</string>
     <string name="learn_more">Learn more</string>
     <string name="drawer_synced_folders">Auto upload</string>
-    <string name="drawer_participate">Participate</string>
+    <string name="drawer_participate">Community</string>
     <string name="participate_testing_headline">Help by testing</string>
     <string name="participate_testing_bug_text">Found a bug? Oddments?</string>
     <string name="participate_testing_report_text">Report an issue on GitHub</string>
@@ -794,7 +793,6 @@
     <string name="new_media_folder_videos">video</string>
     <string name="outdated_server">The server has reached end of life, please upgrade!</string>
     <string name="dismiss">Dismiss</string>
-    <string name="feedback_no_mail_app">No app available to send mails!</string>
     <string name="drawer_item_trashbin">Deleted files</string>
     <string name="trashbin_activity_title">Deleted files</string>
     <string name="action_empty_trashbin">Empty trashbin</string>

src/main/res/xml/preferences.xml

@@ -68,7 +68,6 @@
 			android:summary="Displays your E2E 12 words passphrase" />
 		<Preference android:title="@string/prefs_help" android:key="help" />
 		<Preference android:title="@string/prefs_recommend" android:key="recommend" />
-		<Preference android:title="@string/prefs_feedback" android:key="feedback" />
 		<Preference android:title="@string/logs_title" android:key="logger" />
 		<Preference android:title="@string/prefs_imprint" android:key="imprint" />
 	</PreferenceCategory>