Merge pull request #246 from nextcloud/130rcBugfix

1.3.0 RC Bugfixes

AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10030001"
-    android:versionName="1.3.0 RC1">
+    android:versionCode="10030002"
+    android:versionName="1.3.0 RC2">
 
     <uses-sdk
         android:minSdkVersion="14"

res/layout/participate_layout.xml

@@ -61,9 +61,9 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/participate_testing_report"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:onClick="onReportIssueClick"
                     android:text="@string/participate_testing_report_text"
                     android:theme="@style/Button.Primary"/>
 
@@ -145,11 +145,34 @@
                     android:textAppearance="?android:attr/textAppearanceLarge"/>
 
                 <TextView
-                    android:id="@+id/participate_contribute_text"
+                    android:id="@+id/participate_contribute_irc_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/participate_contribute_text"
-                    android:paddingLeft="@dimen/standard_half_padding"
+                    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>

res/layout/upload_files_layout.xml

@@ -45,14 +45,25 @@
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/standard_padding">
+        android:paddingTop="@dimen/standard_half_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        android:paddingLeft="@dimen/standard_padding"
+        android:paddingRight="@dimen/standard_padding">
 
-        <Spinner
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/uploader_upload_files_behaviour"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:paddingBottom="@dimen/standard_half_padding"/>
+
+        <Spinner
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:id="@+id/upload_files_spinner_behaviour"
             android:layout_weight="1"/>
     </LinearLayout>

res/values/dims.xml

@@ -37,6 +37,7 @@
     <dimen name="file_avatar_size">128dp</dimen>
     <dimen name="standard_padding">16dp</dimen>
     <dimen name="standard_half_padding">8dp</dimen>
+    <dimen name="standard_quarter_padding">4dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
     <dimen name="standard_half_margin">8dp</dimen>
     <dimen name="min_list_item_size">56dp</dimen>

res/values/setup.xml

@@ -78,6 +78,7 @@
     <string name="fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.nextcloud.client</string>
     <string name="irc_weblink" translatable="false">http://webchat.freenode.net?channels=nextcloud-mobile</string>
     <string name="help_link" translatable="false">https://help.nextcloud.com/c/clients/android</string>
+    <string name="translation_link" translatable="false">https://www.transifex.com/nextcloud/nextcloud/android/</string>
     <string name="contributing_link" translatable="false">https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md</string>
     <string name="report_issue_link" translatable="false">https://github.com/nextcloud/android/issues</string>
 

res/values/strings.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="about_android">%1$s Android app</string>
@@ -69,9 +68,10 @@
     <string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string>
     <string name="uploader_error_message_source_file_not_found">File to upload was not found in its location. Please check whether the file exists.</string>
     <string name="uploader_error_message_source_file_not_copied">An error occurred while copying the file to a temporary folder. Please try to send again.</string>
-    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">move to nextcloud folder</string>
-    <string name="uploader_upload_files_behaviour_only_upload">only upload</string>
-    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">upload and delete from source</string>
+    <string name="uploader_upload_files_behaviour">Upload option:</string>
+    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to Nextcloud folder</string>
+    <string name="uploader_upload_files_behaviour_only_upload">Keep file in source folder</string>
+    <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Delete file from source folder</string>
     <string name="file_list_seconds_ago">seconds ago</string>
     <string name="file_list_empty">Nothing in here. Upload something!</string>
     <string name="file_list_loading">Loading&#8230;</string>
@@ -475,15 +475,16 @@
     <string name="participate_testing_report_text">Report an issue on Github</string>
     <string name="participate_testing_version_text">Interested in helping us testing the next Version?</string>
     <string name="participate_beta_headline">Test the Beta version</string>
-    <string name="participate_beta_text">This includes all upcoming features and is very bleeding edge. Bugs/errors can occur and if they do, please report them to us. &lt;a href="%2$s">Download the APK&lt;/a> or</string>
+    <string name="participate_beta_text">This includes all upcoming features and is very bleeding edge. Bugs/errors
+        can occur and if they do, please report them to us. &lt;br/>&lt;a href="%2$s">Download the APK&lt;/a>
+        or</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
-    <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming
-        release and it is expected to be stable. Testing your individual setup could help to ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
+    <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and it is expected to be stable. Testing your individual setup could help to ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
-    <string name="participate_contribute_text">&lt;ul>&lt;li>Join the chat on IRC: &lt;a
-        href="%1$s">#nextcloud-mobile&lt;/a>&lt;/li>&lt;li>Help others on the &lt;a
-        href="%2$s>forum&lt;/a>&lt;/li>&lt;li>Be part of the Team and contribute as a developer: &lt;a
-        href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">Github CONTRIBUTING.md&lt;/a>&lt;/li&lt;/ul></string>
+    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s>forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href="%1$s>Translate&lt;/a> the app</string>
+    <string name="participate_contribute_github_text">Contribute as a developer, see &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for details</string>
     <plurals name="items_selected_count">
         <!--
              As a developer, you should always supply "one" and "other"

src/com/owncloud/android/ui/activity/ParticipateActivity.java

@@ -28,6 +28,7 @@ import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
@@ -36,6 +37,7 @@ import com.owncloud.android.R;
  * Activity providing information about ways to participate in the app's development.
  */
 public class ParticipateActivity extends FileActivity {
+    private Button mReportBtn;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,17 +66,38 @@ public class ParticipateActivity extends FileActivity {
         TextView rcView = (TextView) findViewById(R.id.participate_release_candidate_text);
         rcView.setMovementMethod(LinkMovementMethod.getInstance());
 
-        TextView contributeView = (TextView) findViewById(R.id.participate_contribute_text);
-        contributeView.setMovementMethod(LinkMovementMethod.getInstance());
-        contributeView.setText(Html.fromHtml(
-                getString(R.string.participate_contribute_text,
-                        getString(R.string.irc_weblink),
+        TextView contributeIrcView = (TextView) findViewById(R.id.participate_contribute_irc_text);
+        contributeIrcView.setMovementMethod(LinkMovementMethod.getInstance());
+        contributeIrcView.setText(Html.fromHtml(
+                getString(R.string.participate_contribute_irc_text,
+                        getString(R.string.irc_weblink)
+                )));
+
+        TextView contributeForumView = (TextView) findViewById(R.id.participate_contribute_forum_text);
+        contributeForumView.setMovementMethod(LinkMovementMethod.getInstance());
+        contributeForumView.setText(Html.fromHtml(
+                getString(R.string.participate_contribute_forum_text,
                         getString(R.string.help_link)
                 )));
-    }
 
-    public void onReportIssueClick(View view) {
-        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.report_issue_link))));
+        TextView contributeTranslationView = (TextView) findViewById(R.id.participate_contribute_translate_text);
+        contributeTranslationView.setMovementMethod(LinkMovementMethod.getInstance());
+        contributeTranslationView.setText(Html.fromHtml(
+                getString(R.string.participate_contribute_translate_text,
+                        getString(R.string.translation_link)
+                )));
+
+        TextView contributeGithubView = (TextView) findViewById(R.id.participate_contribute_github_text);
+        contributeGithubView.setMovementMethod(LinkMovementMethod.getInstance());
+        contributeGithubView.setText(Html.fromHtml(getString(R.string.participate_contribute_github_text)));
+
+        mReportBtn = (Button) findViewById(R.id.participate_testing_report);
+        mReportBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.report_issue_link))));
+            }
+        });
     }
 
     public void onGetBetaFDroidClick(View view) {