From: masensio <masensio@solidgear.es>
Date: Fri, 25 Oct 2013 13:06:10 +0000 (+0200)
Subject: Customize buttons
X-Git-Tag: oc-android-1.5.5~139^2~20
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6e21c840263184af124a0e86b2c20c1265a36869

Customize buttons
---

diff --git a/res/values/setup.xml b/res/values/setup.xml
index decc2bd0..80463d20 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -23,6 +23,9 @@
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>
     
+    <!-- Button -->
+    <bool name="custom_buttons">false</bool>
+    
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">false</bool>
     
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d7f8cde4..3a3e8391 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,11 +24,13 @@
 	<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+    	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 	</style>
 	
 	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+      <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
     </style>
 	
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
@@ -53,7 +55,12 @@
 	<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
 	</style>
 	
-	
+	<!-- Buttons -->
+    <style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
+        <item name="android:background">@drawable/btn_default</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
 	<!-- PopDownMenu -->
 	<style name="Animations.PopDownMenu" />
 	
diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
index 31578d93..049b4787 100644
--- a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
@@ -197,9 +197,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// complete label for 'register account' button
         Button b = (Button) findViewById(R.id.account_register);
         if (b != null) {
-            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            
         }
 
+        /// complete background of 'OK' button
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+            mOkButton.setBackgroundResource(R.drawable.btn_default);
+        
         /// initialization
         mAccountMgr = AccountManager.get(this);
         mNewCapturedUriFromOAuth2Redirection = null;
diff --git a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
index ad4b3b10..b5294954 100644
--- a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
@@ -42,6 +42,14 @@ public class ExtensionsAvailableDialog extends DialogFragment implements
                 container);
         Button btnYes = (Button) view.findViewById(R.id.buttonYes);
         Button btnNo = (Button) view.findViewById(R.id.buttonNo);
+        
+        // Set background of buttons
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) {
+            btnYes.setBackgroundResource(R.drawable.btn_default);
+            btnNo.setBackgroundResource(R.drawable.btn_default);
+        }
+        
         btnYes.setOnClickListener(this);
         btnNo.setOnClickListener(this);
         getDialog().setTitle(R.string.extensions_avail_title);
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index 77645ab3..f9367271 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -119,6 +119,13 @@ public class ErrorsWhileCopyingHandlerActivity  extends SherlockFragmentActivity
         /// customize buttons
         Button cancelBtn = (Button) findViewById(R.id.cancel);
         Button okBtn = (Button) findViewById(R.id.ok);
+        // Set background of buttons
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) {
+            cancelBtn.setBackgroundResource(R.drawable.btn_default);
+            okBtn.setBackgroundResource(R.drawable.btn_default);
+        }
+        
         okBtn.setText(R.string.foreign_files_move);
         cancelBtn.setOnClickListener(this);
         okBtn.setOnClickListener(this);
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
index 13a383a7..c1bb9e2a 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
@@ -44,8 +44,13 @@ public class FailedUploadActivity extends Activity {
         String message = getIntent().getStringExtra(MESSAGE);
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);
         textView.setText(message);
-        Button close_button = (Button) findViewById(R.id.failed_uploadactivity_close_button);
-        close_button.setOnClickListener(new OnClickListener() {
+        Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);
+        // Set background of 'close' button
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) 
+            closeBtn.setBackgroundResource(R.drawable.btn_default);
+        
+        closeBtn.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
index 9094422b..6be111d9 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
@@ -76,13 +76,20 @@ public class InstantUploadActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.failed_upload_files);
 
-        Button delete_all_btn = (Button) findViewById(R.id.failed_upload_delete_all_btn);
-        delete_all_btn.setOnClickListener(getDeleteListner());
-        Button retry_all_btn = (Button) findViewById(R.id.failed_upload_retry_all_btn);
-        retry_all_btn.setOnClickListener(getRetryListner());
+        Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn);
+        deleteAllBtn.setOnClickListener(getDeleteListner());
+        Button retryAllBtn = (Button) findViewById(R.id.failed_upload_retry_all_btn);
+        retryAllBtn.setOnClickListener(getRetryListner());
         this.failed_upload_all_cb = (CheckBox) findViewById(R.id.failed_upload_headline_cb);
         failed_upload_all_cb.setOnCheckedChangeListener(getCheckAllListener());
         listView = (LinearLayout) findViewById(R.id.failed_upload_scrollviewlayout);
+        
+        // Set background of buttons
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) {
+            deleteAllBtn.setBackgroundResource(R.drawable.btn_default);
+            retryAllBtn.setBackgroundResource(R.drawable.btn_default);
+        }
 
         loadListView(true);
 
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
index 2a3698ea..0066bc13 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
@@ -53,6 +53,12 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On
         actionBar.setDisplayHomeAsUpEnabled(true);
         ListView listView = (ListView) findViewById(android.R.id.list);
         Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
+        
+        // Set background of 'deleteHistory' button
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) 
+            deleteHistoryButton.setBackgroundResource(R.drawable.btn_default);
+            
         deleteHistoryButton.setOnClickListener(new OnClickListener() {
             
             @Override
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
index 8c5d0774..5cd1a795 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
@@ -81,7 +81,10 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         
-        
+        // Set background of 'Cancel' button
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) 
+            bCancel.setBackgroundResource(R.drawable.btn_default);
         
         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
index b9b7f0dc..49d9b847 100644
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
@@ -107,6 +107,13 @@ public class UploadFilesActivity extends FileActivity implements
         mCancelBtn.setOnClickListener(this);
         mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.setOnClickListener(this);
+        
+        // Set background of buttons
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons) {
+            mCancelBtn.setBackgroundResource(R.drawable.btn_default);
+            mUploadBtn.setBackgroundResource(R.drawable.btn_default);
+        }
             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();