From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 10:24:29 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea7f8fe49152fee3d92f1762d0e6538fa081c9d8?hp=bf21e3f026f312a06da6f1a5b6163140386f3d9e

Merge branch 'setup_colors' into setup_app_name
---

diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index d5881ab8..e0e86b34 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
@@ -22,6 +22,6 @@
 
     <item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
     <item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
-    <item android:drawable="@color/owncloud_white" />
+    <item android:drawable="@color/background_color" />
 
 </selector>
diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml
index 855ba2c1..8cd82e4b 100644
--- a/res/drawable/main_header_bg.xml
+++ b/res/drawable/main_header_bg.xml
@@ -19,8 +19,8 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#1D2D44" 
-        android:endColor="#1D2D44"
+        android:startColor="@color/actionbar_start_color" 
+        android:endColor="@color/actionbar_end_color"
         android:angle="270"
      />
     <corners android:radius="0dp" />
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index 4bd3cddb..d3964564 100644
--- a/res/layout-v14/generic_explanation.xml
+++ b/res/layout-v14/generic_explanation.xml
@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white" 
+    android:background="@color/background_color" 
     android:id="@+id/explanation"
     android:orientation="vertical">
 
diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml
index 0f459a0b..b4deeed3 100644
--- a/res/layout/failed_upload_files.xml
+++ b/res/layout/failed_upload_files.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     android:orientation="vertical"
     android:id="@+id/failed_files_list_view">
 
diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
index 41e9a7d0..cf205445 100644
--- a/res/layout/failed_upload_message_view.xml
+++ b/res/layout/failed_upload_message_view.xml
@@ -2,7 +2,7 @@
     android:id="@+id/failed_upload_message_view"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     android:orientation="vertical" >
 
    <TextView android:id="@+id/faild_upload_message" 
diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index ec69fe7d..483a3691 100644
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@ -23,7 +23,7 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     android:gravity="center"
     tools:context=".ui.fragment.FilePreviewFragment" >
 
diff --git a/res/layout/files.xml b/res/layout/files.xml
index 74a9e4b4..50bc1059 100644
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     android:orientation="horizontal"
     android:baselineAligned="false"
     >
diff --git a/res/layout/fragment_changelog.xml b/res/layout/fragment_changelog.xml
index e2182365..bc29e10f 100644
--- a/res/layout/fragment_changelog.xml
+++ b/res/layout/fragment_changelog.xml
@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white" 
+    android:background="@color/background_color" 
     android:id="@+id/explanation"
     android:orientation="vertical">
 
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index be98f3b8..cd887553 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/owncloud_white" 
+    android:background="@color/background_color" 
     android:id="@+id/explanation"
     android:orientation="vertical">
 
diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index 3deb2fd4..253c829b 100644
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -23,7 +23,7 @@
     android:id="@+id/fdScrollView"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/owncloud_white" 
+    android:background="@color/background_color" 
     android:gravity="center_horizontal"
 -->
 
@@ -32,7 +32,7 @@
     android:id="@+id/top"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     tools:context=".ui.fragment.PreviewImageFragment" >
 
     <ProgressBar 
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 7e4bdd53..6c15ff7e 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -20,7 +20,7 @@
     android:id="@+id/upload_files_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"
     android:orientation="vertical" >
 
     <fragment
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2be262f7..ce9b2d1f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,6 +21,5 @@
     
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="owncloud_blue_bright">#00ddff</color>
-    <color name="owncloud_white">#F7F7F7</color>
     
 </resources>
\ No newline at end of file
diff --git a/res/values/setup.xml b/res/values/setup.xml
index d65bff5d..2c73d269 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -17,4 +17,9 @@
     <string name="auth_method_oauth2">off</string>
     <string name="auth_method_saml_web_sso">off</string>
     
+    <!-- Colors -->
+    <color name="background_color">#F7F7F7</color>
+    <color name="actionbar_start_color">#1D2D44</color>
+    <color name="actionbar_end_color">#1D2D44</color>
+    
 </resources>
diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
index 26bbf63f..f0ee7219 100644
--- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
@@ -149,7 +149,7 @@ public class InstantUploadActivity extends Activity {
                 loadmoreBtn = new Button(this);
                 loadmoreBtn.setId(42);
                 loadmoreBtn.setText(getString(R.string.failed_upload_load_more_images));
-                loadmoreBtn.setBackgroundResource(R.color.owncloud_white);
+                loadmoreBtn.setBackgroundResource(R.color.background_color);
                 loadmoreBtn.setTextSize(12);
                 loadmoreBtn.setOnClickListener(new OnClickListener() {
                     @Override
@@ -328,14 +328,14 @@ public class InstantUploadActivity extends Activity {
 
         TextView failureTextView = new TextView(this);
         failureTextView.setText(getString(R.string.failed_upload_failure_text) + message);
-        failureTextView.setBackgroundResource(R.color.owncloud_white);
+        failureTextView.setBackgroundResource(R.color.background_color);
         failureTextView.setTextSize(8);
         failureTextView.setOnLongClickListener(getOnLongClickListener(message));
         failureTextView.setPadding(5, 5, 5, 10);
         TextView retryButton = new TextView(this);
         retryButton.setId(id);
         retryButton.setText(img_path);
-        retryButton.setBackgroundResource(R.color.owncloud_white);
+        retryButton.setBackgroundResource(R.color.background_color);
         retryButton.setTextSize(8);
         retryButton.setOnClickListener(getImageButtonOnClickListener(img_path));
         retryButton.setOnLongClickListener(getOnLongClickListener(message));
@@ -365,7 +365,7 @@ public class InstantUploadActivity extends Activity {
     private CheckBox getFileCheckbox(int id) {
         CheckBox retryCB = new CheckBox(this);
         retryCB.setId(id);
-        retryCB.setBackgroundResource(R.color.owncloud_white);
+        retryCB.setBackgroundResource(R.color.background_color);
         retryCB.setTextSize(8);
         retryCB.setTag(retry_chexbox_tag);
         return retryCB;