revised text and order

res/layout/whats_new_element.xml

@@ -31,7 +31,8 @@
         android:id="@+id/whatsNewImage"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="10dp"
-        android:layout_weight="50"/>
+        android:layout_weight="50"
+        android:src="@drawable/whats_new_files"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -39,7 +40,7 @@
         android:textAppearance="@style/NextcloudTextAppearanceHeadline"
         android:textColor="@color/white"
         android:textStyle="bold"
-        android:text="@string/placeholder_sentence"
+        android:text="@string/welcome_feature_1_title"
         android:id="@+id/whatsNewTitle"
         android:layout_gravity="center_horizontal"
         android:gravity="center"/>
@@ -48,7 +49,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/NextcloudTextAppearanceMedium"
         android:textColor="@color/login_text_hint_color"
-        android:text="@string/placeholder_sentence"
+        android:text="@string/welcome_feature_1_text"
         android:id="@+id/whatsNewText"
         android:layout_margin="@dimen/standard_margin"
         android:layout_gravity="center_horizontal"

res/values/strings.xml

@@ -549,14 +549,14 @@
     <string name="whats_new_title">What\'s new in Nextcloud</string>
 
     <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">Instant upload</string>
-    <string name="welcome_feature_1_text">Keep your photos safe</string>
+    <string name="welcome_feature_1_title">A safe home for all your data</string>
+    <string name="welcome_feature_1_text">Access, share &amp; protect your files at home and in your enterprise</string>
 
-    <string name="welcome_feature_2_title">Manage all your files</string>
-    <string name="welcome_feature_2_text">You can delete, move</string>
+    <string name="welcome_feature_2_title">MultiAccount</string>
+    <string name="welcome_feature_2_text">Connect to all your clouds</string>
 
-    <string name="welcome_feature_3_title">MultiAccount</string>
-    <string name="welcome_feature_3_text">Connect to all your clouds</string>
+    <string name="welcome_feature_3_title">Instant upload</string>
+    <string name="welcome_feature_3_text">Keep your photos safe</string>
 
     <string name="whats_new_skip">Skip</string>
 </resources>

src/com/owncloud/android/features/FeatureList.java

@@ -44,13 +44,13 @@ public class FeatureList {
 
     static final private FeatureItem featuresList[] = {
             // Basic features showed on first install
-            new FeatureItem(R.drawable.what_new_instant_upload,
+            new FeatureItem(R.drawable.whats_new_files,
                     R.string.welcome_feature_1_title, R.string.welcome_feature_1_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
-            new FeatureItem(R.drawable.whats_new_files,
+            new FeatureItem(R.drawable.whats_new_accounts,
                     R.string.welcome_feature_2_title, R.string.welcome_feature_2_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
-            new FeatureItem(R.drawable.whats_new_accounts,
+            new FeatureItem(R.drawable.what_new_instant_upload,
                     R.string.welcome_feature_3_title, R.string.welcome_feature_3_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
             // Features introduced in certain point in time