Andy Scherzinger 8 жил өмнө
parent
commit
528b8d5e5e

+ 2 - 2
res/layout/whats_new_activity.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text=""
+        android:text="@string/placeholder_sentence"
         android:id="@+id/welcomeText"
         android:layout_margin="5dp"
         android:layout_weight="10"
@@ -39,7 +39,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Skip"
+            android:text="@string/whats_new_skip"
             android:layout_gravity="center_vertical|center_horizontal"/>
 
         <com.owncloud.android.ui.whatsnew.ProgressIndicator

+ 9 - 5
res/layout/whats_new_element.xml

@@ -7,7 +7,7 @@
 
     <ImageView
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:id="@+id/whatsNewImage"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="10dp"
@@ -16,15 +16,19 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="@style/NextcloudTextAppearanceHeadline"
         android:textStyle="bold"
+        android:text="@string/placeholder_sentence"
         android:id="@+id/whatsNewTitle"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAppearance="@style/NextcloudTextAppearanceMedium"
+        android:text="@string/placeholder_sentence"
         android:id="@+id/whatsNewText"
         android:layout_margin="@dimen/standard_margin"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"/>
 </LinearLayout>

+ 2 - 2
res/values/strings.xml

@@ -347,7 +347,7 @@
     <string name="network_error_socket_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
     <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
     <string name="network_host_not_available">The operation couldn\'t be completed; server is unavailable</string>
-    <string name="empty" />
+    <string name="empty" translatable="false" />
 
     <string name="forbidden_permissions">You do not have permission %s</string>
     <string name="forbidden_permissions_rename">to rename this file</string>
@@ -546,7 +546,6 @@
     <string name="storage_description_unknown">Unknown</string>
 
     <!-- What's new feature and texts to show -->
-    <string name="welcome_to_nc_title">Welcome to Nextcloud!</string>
     <string name="whats_new_title">What\'s new in Nextcloud</string>
 
     <!-- Welcome to oC intro features -->
@@ -563,4 +562,5 @@
     <string name="welcome_feature_4_text">Connect to all your clouds</string>
 
     <string name="welcome_feature_5_title">Your private files synced anywhere</string>
+    <string name="whats_new_skip">Skip</string>
 </resources>

+ 10 - 0
res/values/styles.xml

@@ -277,4 +277,14 @@
     </style>
     <style name="Theme.ownCloud.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
     <style name="Theme.ownCloud.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+	<!-- Text styles -->
+	<style name="NextcloudTextAppearanceHeadline" parent="style/TextAppearance.AppCompat.Headline">
+		<item name="android:textSize">28sp</item>
+		<item name="android:textColor">#000000</item>
+	</style>
+	<style name="NextcloudTextAppearanceMedium" parent="style/TextAppearance.AppCompat.Medium">
+	</style>
+	<style name="NextcloudTextAppearanceSmall" parent="style/TextAppearance.AppCompat.Small">
+	</style>
 </resources>

+ 1 - 1
src/com/owncloud/android/ui/activity/WhatsNewActivity.java

@@ -99,7 +99,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         });
 
         TextView tv = (TextView)findViewById(R.id.welcomeText);
-        tv.setText(isFirstRun() ? R.string.welcome_to_nc_title : R.string.whats_new_title);
+        tv.setText(isFirstRun() ? R.string.empty : R.string.whats_new_title);
 
         updateNextButtonIfNeeded();
     }