소스 검색

incorporating the new feature graphics and coloring

Andy Scherzinger 8 년 전
부모
커밋
d23a01b573

+ 3 - 2
AndroidManifest.xml

@@ -183,7 +183,7 @@
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.ownCloud.noActionBar.Login" >
+            android:theme="@style/Theme.ownCloud.noActionBar.Login">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -219,7 +219,8 @@
 
         <activity android:name=".ui.errorhandling.ErrorShowActivity" />
         <activity android:name=".ui.activity.UploadListActivity" />
-        <activity android:name=".ui.activity.WhatsNewActivity" />
+        <activity android:name=".ui.activity.WhatsNewActivity"
+                  android:theme="@style/Theme.ownCloud.noActionBar.Login" />
         
         <receiver android:name=".files.services.ConnectivityActionReceiver"
 		    android:enabled="true" android:label="ConnectivityActionReceiver">

+ 2 - 1
res/drawable-anydpi-v21/arrow_right.xml

@@ -4,5 +4,6 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#007CC2" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
+    <path android:fillColor="#ffffff"
+          android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
 </vector>

BIN
res/drawable-hdpi/whats_new_oc_files.png


+ 1 - 1
res/drawable/indicator_dot_selected.xml

@@ -22,7 +22,7 @@
     <item android:bottom="5dp" android:top="5dp" android:right="5dp" android:left="5dp">
         <shape
             android:shape="oval">
-            <solid android:color="@color/owncloud_blue_accent"/>
+            <solid android:color="@color/white"/>
             <size android:width="8dp" android:height="8dp" />
         </shape>
     </item>

+ 20 - 19
res/layout/whats_new_activity.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:orientation="vertical"
               android:weightSum="100">
 
-
     <TextView
+        android:id="@+id/welcomeText"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/placeholder_sentence"
-        android:id="@+id/welcomeText"
         android:layout_margin="5dp"
         android:layout_weight="10"
-        android:gravity="center"/>
+        android:gravity="center"
+        android:text="@string/placeholder_sentence"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/login_text_hint_color"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/contentPanel"
@@ -24,45 +24,46 @@
     </android.support.v4.view.ViewPager>
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="10"
-        android:weightSum="3"
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginLeft="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin">
+        android:layout_marginRight="@dimen/standard_margin"
+        android:layout_weight="10"
+        android:orientation="horizontal"
+        android:weightSum="3">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/skip"
-            style="@style/Button.Borderless"
+            style="@style/Button.Borderless.Login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
             android:layout_weight="1"
-            android:text="@string/whats_new_skip"
-            android:layout_gravity="center_vertical|center_horizontal"/>
+            android:text="@string/whats_new_skip"/>
 
         <com.owncloud.android.ui.whatsnew.ProgressIndicator
             android:id="@+id/progressIndicator"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical|center_horizontal">
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_weight="1">
         </com.owncloud.android.ui.whatsnew.ProgressIndicator>
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:layout_gravity="center">
+            android:orientation="vertical">
+
             <ImageButton
                 android:id="@+id/forward"
-                android:src="@drawable/arrow_right"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:padding="@dimen/standard_padding"/>
+                android:padding="@dimen/standard_padding"
+                android:src="@drawable/arrow_right"/>
         </LinearLayout>
     </LinearLayout>
 

+ 2 - 0
res/layout/whats_new_element.xml

@@ -17,6 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@style/NextcloudTextAppearanceHeadline"
+        android:textColor="@color/white"
         android:textStyle="bold"
         android:text="@string/placeholder_sentence"
         android:id="@+id/whatsNewTitle"
@@ -26,6 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@style/NextcloudTextAppearanceMedium"
+        android:textColor="@color/login_text_hint_color"
         android:text="@string/placeholder_sentence"
         android:id="@+id/whatsNewText"
         android:layout_margin="@dimen/standard_margin"

+ 4 - 0
res/values/styles.xml

@@ -113,6 +113,10 @@
 		<item name="android:textColor">@color/color_accent</item>
 	</style>
 
+	<style name="Button.Borderless.Login" parent="Base.Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">@color/white</item>
+	</style>
+
 	<!-- separat translucent action bar style -->
 	<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
 		<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>

+ 0 - 2
src/com/owncloud/android/features/FeatureList.java

@@ -24,7 +24,6 @@ package com.owncloud.android.features;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -48,7 +47,6 @@ public class FeatureList {
             new FeatureItem(R.drawable.whats_new_files, R.string.welcome_feature_2_title,  R.string.welcome_feature_2_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_share, R.string.welcome_feature_3_title,  R.string.welcome_feature_3_text, "1.0.0", "0" ,SHOW_ON_FIRST_RUN),
             new FeatureItem(R.drawable.whats_new_accounts, R.string.welcome_feature_4_title,  R.string.welcome_feature_4_text, "1.0.0", "0", SHOW_ON_FIRST_RUN),
-            new FeatureItem(R.drawable.whats_new_oc_files, R.string.welcome_feature_5_title,  FeatureItem.DO_NOT_SHOW, "1.0.0", "0", SHOW_ON_FIRST_RUN),
             // Features introduced in certain point in time
     };
 

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

@@ -68,7 +68,8 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
         mProgress = (ProgressIndicator) findViewById(R.id.progressIndicator);
         mPager = (ViewPager)findViewById(R.id.contentPanel);
         final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
-        FeaturesViewAdapter adapter = new FeaturesViewAdapter(getSupportFragmentManager(), FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta));
+        FeaturesViewAdapter adapter = new FeaturesViewAdapter(getSupportFragmentManager(),
+                FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta));
 
         mProgress.setNumberOfSteps(adapter.getCount());
         mPager.setAdapter(adapter);
@@ -114,11 +115,6 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
     private void updateNextButtonIfNeeded() {
         if (!mProgress.hasNextStep()) {
             mForwardFinishButton.setImageResource(R.drawable.ic_done_white);
-            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                mForwardFinishButton.setBackground(getResources().getDrawable(R.drawable.round_button));
-            } else {
-                mForwardFinishButton.setBackgroundDrawable(getResources().getDrawable(R.drawable.round_button));
-            }
         } else {
             mForwardFinishButton.setImageResource(R.drawable.arrow_right);
             if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {