OC-1670: owncloud_white --> background_color

diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index d5881ab..e0e86b3 100644 (file)
--- 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_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>
 
 </selector>

diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index 4bd3cdd..d396456 100644 (file)
--- 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"
 <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">
 
     android:id="@+id/explanation"
     android:orientation="vertical">
 

diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml
index 0f459a0..b4deeed 100644 (file)
--- 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"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r

-    android:background="@color/owncloud_white"\r
+    android:background="@color/background_color"\r

     android:orientation="vertical"\r
     android:id="@+id/failed_files_list_view">\r
 \r
     android:orientation="vertical"\r
     android:id="@+id/failed_files_list_view">\r
 \r

diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
index 41e9a7d..cf20544 100644 (file)
--- 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"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
     android:id="@+id/failed_upload_message_view"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r

-    android:background="@color/owncloud_white"\r
+    android:background="@color/background_color"\r

     android:orientation="vertical" >\r
 \r
    <TextView android:id="@+id/faild_upload_message" \r
     android:orientation="vertical" >\r
 \r
    <TextView android:id="@+id/faild_upload_message" \r

diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index ec69fe7..483a369 100644 (file)
--- 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: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" >
 
     android:gravity="center"
     tools:context=".ui.fragment.FilePreviewFragment" >
 

diff --git a/res/layout/files.xml b/res/layout/files.xml
index 74a9e4b..50bc105 100644 (file)
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -20,7 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r

-    android:background="@color/owncloud_white"\r
+    android:background="@color/background_color"\r

     android:orientation="horizontal"\r
     android:baselineAligned="false"\r
     >\r
     android:orientation="horizontal"\r
     android:baselineAligned="false"\r
     >\r

diff --git a/res/layout/fragment_changelog.xml b/res/layout/fragment_changelog.xml
index e218236..bc29e10 100644 (file)
--- 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"
 <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">
 
     android:id="@+id/explanation"
     android:orientation="vertical">
 

diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index be98f3b..cd88755 100644 (file)
--- 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"
 <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">
 
     android:id="@+id/explanation"
     android:orientation="vertical">
 

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index 3deb2fd..253c829 100644 (file)
--- 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: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"
 -->
 
     android:gravity="center_horizontal"
 -->
 


@@ -32,7 +32,7 @@
     android:id="@+id/top"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     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 
     tools:context=".ui.fragment.PreviewImageFragment" >
 
     <ProgressBar 

diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 7e4bdd5..6c15ff7 100644 (file)
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -20,7 +20,7 @@
     android:id="@+id/upload_files_layout"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
     android:id="@+id/upload_files_layout"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r

-    android:background="@color/owncloud_white"\r
+    android:background="@color/background_color"\r

     android:orientation="vertical" >\r
 
     <fragment\r
     android:orientation="vertical" >\r
 
     <fragment\r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2be262f..ce9b2d1 100644 (file)
--- 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="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
     
 </resources>
\ No newline at end of file

diff --git a/res/values/setup.xml b/res/values/setup.xml
index b3cb69b..123ed29 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

+    <!-- Colors -->
+    <color name="background_color">#F7F7F7</color>
+    

     <string name="server_url"></string>
     <bool name="show_server_url_input">true</bool>
     
     <string name="server_url"></string>
     <bool name="show_server_url_input">true</bool>
     


@@ -7,4 +10,6 @@
     <string name="auth_method_oauth2">off</string>
     <string name="auth_method_saml_web_sso">off</string>
     
     <string name="auth_method_oauth2">off</string>
     <string name="auth_method_saml_web_sso">off</string>
     

+
+    

 </resources>
 </resources>

diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
index 26bbf63..f0ee721 100644 (file)
--- 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 = 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
                 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);
 
         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);
         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));
         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);
     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;
         retryCB.setTextSize(8);
         retryCB.setTag(retry_chexbox_tag);
         return retryCB;