OC-1833: Add CustomButton class to can change the background of buttons

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 7bd362d..b0a42ae 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -185,7 +185,7 @@
                                                           \r
        </LinearLayout>\r
        \r
-       <Button\r
+       <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
                android:id="@id/buttonOK"\r
                android:layout_width="match_parent"\r
                android:layout_height="wrap_content"\r

diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index d396456..e3d50ca 100644 (file)
--- a/res/layout-v14/generic_explanation.xml
+++ b/res/layout-v14/generic_explanation.xml
@@ -49,14 +49,14 @@
         android:orientation="horizontal" >
 
         <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-               <Button
+               <de.mobilcom.debitel.cloud.android.ui.CustomButton
                    android:id="@+id/ok"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index c263daf..b1f621a 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -166,7 +166,7 @@
             android:gravity="center_vertical"\r
             android:text="@string/auth_unauthorized" />\r
 \r
-        <Button\r
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
             android:id="@+id/buttonOK"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r

diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml
index e5c3d10..64d1021 100644 (file)
--- a/res/layout/extensions_available_dialog.xml
+++ b/res/layout/extensions_available_dialog.xml
@@ -34,14 +34,14 @@
         android:layout_margin="5dp"
         android:weightSum="1.0" >
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/buttonNo"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/common_no"
             android:layout_weight="0.5"/>
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/buttonYes"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"

diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml
index b4deeed..305c5e6 100644 (file)
--- a/res/layout/failed_upload_files.xml
+++ b/res/layout/failed_upload_files.xml
@@ -63,7 +63,7 @@
                 android:text="@string/failed_upload_all_cb"\r
                 android:textSize="8sp" />\r
 \r
-            <Button\r
+            <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
                 android:id="@+id/failed_upload_retry_all_btn"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
@@ -72,7 +72,7 @@
                 android:text="@string/failed_upload_headline_retryall_btn"\r
                 android:textSize="8sp" />\r
 \r
-            <Button\r
+            <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
                 android:id="@+id/failed_upload_delete_all_btn"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r

diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
index cf20544..da5808c 100644 (file)
--- a/res/layout/failed_upload_message_view.xml
+++ b/res/layout/failed_upload_message_view.xml
@@ -10,7 +10,7 @@
        android:layout_height="wrap_content"\r
        android:minWidth="100dp"/>\r
    \r
-   <Button\r
+   <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
     android:id="@+id/failed_uploadactivity_close_button"\r
     android:layout_width="fill_parent"\r
     android:layout_height="wrap_content"\r

diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index cd88755..4249bc6 100644 (file)
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -48,14 +48,14 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-               <Button
+               <de.mobilcom.debitel.cloud.android.ui.CustomButton
                    android:id="@+id/ok"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/common_ok" />
                
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index ddeac69..d836844 100644 (file)
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -24,7 +24,8 @@
          android:layout_height="wrap_content"
          android:gravity="bottom">
         
-     <Button           android:id="@+id/deleteLogHistoryButton"
+     <de.mobilcom.debitel.cloud.android.ui.CustomButton
+               android:id="@+id/deleteLogHistoryButton"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:text="@string/prefs_log_delete_history_button"/>

diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml
index 0c9cf13..3d933c1 100644 (file)
--- a/res/layout/no_account_available.xml
+++ b/res/layout/no_account_available.xml
@@ -39,7 +39,7 @@
             android:text="@string/main_wrn_accsetup"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/setup_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index 82b3b94..ca39d8d 100644 (file)
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -68,7 +68,7 @@
             style="@style/PassCodeStyle" />\r
     </LinearLayout>\r
 \r
-    <Button android:layout_width="wrap_content"\r
+    <de.mobilcom.debitel.cloud.android.ui.CustomButton android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
         android:text="@string/common_cancel"\r
         android:textColor="@android:color/black"\r

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 9da017b..5106045 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -408,21 +408,21 @@
         android:layout_height="wrap_content"
         android:gravity="center" >
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/details_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
-        <Button
+        <de.mobilcom.debitel.cloud.android.ui.CustomButton
             android:id="@+id/ok"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 69e4641..bfc39a6 100644 (file)
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -35,13 +35,13 @@
         android:layout_height="wrap_content"\r
         android:gravity="center"\r
         android:orientation="horizontal" >\r
-\r        <Button\r
+\r        <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
             android:id="@+id/upload_files_btn_cancel"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_weight="1"\r
             android:text="@string/common_cancel" />\r
-\r              <Button\r
+\r              <de.mobilcom.debitel.cloud.android.ui.CustomButton\r
                    android:id="@+id/upload_files_btn_upload"\r
                    android:layout_width="wrap_content"\r
                    android:layout_height="wrap_content"\r

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 5b31499..e38f4a4 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -33,8 +33,8 @@
        </FrameLayout>
        <LinearLayout android:id="@+id/linearLayout1"
                android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
-               <Button android:layout_gravity="bottom" android:layout_height="wrap_content"
+               <de.mobilcom.debitel.cloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
                        android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
-                       android:text="@string/uploader_btn_upload_text"></Button>
+                       android:text="@string/uploader_btn_upload_text"/>
        </LinearLayout>
 </RelativeLayout>

diff --git a/src/de/mobilcom/debitel/cloud/android/Uploader.java b/src/de/mobilcom/debitel/cloud/android/Uploader.java
index 0cb3d76..d788136 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/Uploader.java
+++ b/src/de/mobilcom/debitel/cloud/android/Uploader.java
@@ -49,7 +49,6 @@ import android.view.View;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
@@ -61,6 +60,7 @@ import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
 import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
 import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 
 /**
  * This can be used to upload things to an ownCloud instance.
@@ -310,7 +310,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                                                 new String[] {"dirname"},
                                                 new int[] {R.id.textView1});
             setListAdapter(sa);
-            Button btn = (Button) findViewById(R.id.uploader_choose_folder);
+            CustomButton btn = (CustomButton) findViewById(R.id.uploader_choose_folder);
             btn.setOnClickListener(this);
             getListView().setOnItemClickListener(this);
         }

diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
index 049b478..3709779 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
@@ -64,6 +64,7 @@ import de.mobilcom.debitel.cloud.android.operations.OwnCloudServerCheckOperation
 import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;\r
 import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;\r
 import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;\r
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;\r
 import de.mobilcom.debitel.cloud.android.ui.dialog.SamlWebViewDialog;\r
 import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog;\r
 import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
@@ -187,7 +188,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
-        mOkButton = findViewById(R.id.buttonOK);\r
+        mOkButton = (CustomButton) findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r
@@ -200,10 +201,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
         }\r
 \r
-        /// complete background of 'OK' button\r
-        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
-        if (customButtons)\r
-            mOkButton.setBackgroundResource(R.drawable.btn_default);\r
+//        /// complete background of 'OK' button\r
+//        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
+//        if (customButtons)\r
+//            mOkButton.setBackgroundResource(R.drawable.btn_default);\r
         \r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r

diff --git a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
index b529495..e7e899f 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
@@ -20,6 +20,7 @@ package de.mobilcom.debitel.cloud.android.extensions;
 
 import de.mobilcom.debitel.cloud.android.Log_OC;
 import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -27,7 +28,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 
 public class ExtensionsAvailableDialog extends DialogFragment implements
         OnClickListener {
@@ -40,15 +40,8 @@ public class ExtensionsAvailableDialog extends DialogFragment implements
             Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.extensions_available_dialog,
                 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);
-        }
+        CustomButton btnYes = (CustomButton) view.findViewById(R.id.buttonYes);
+        CustomButton btnNo = (CustomButton) view.findViewById(R.id.buttonNo);
         
         btnYes.setOnClickListener(this);
         btnNo.setOnClickListener(this);

diff --git a/src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java b/src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java
new file mode 100644 (file)
index 0000000..09b8215
--- /dev/null
+++ b/src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java
@@ -0,0 +1,45 @@
+package de.mobilcom.debitel.cloud.android.ui;
+
+import de.mobilcom.debitel.cloud.android.R;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.Button;
+/**
+ * @author masensio
+ *
+ * Button for customizing the button background
+ */
+
+public class CustomButton extends Button {
+    
+    public CustomButton(Context context) {
+        super(context);
+        
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+    public CustomButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+    public CustomButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+}

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 f936727..33ffc32 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -33,7 +33,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -44,6 +43,7 @@ import de.mobilcom.debitel.cloud.android.Log_OC;
 import de.mobilcom.debitel.cloud.android.R;
 import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
 import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog;
 import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
@@ -117,14 +117,8 @@ 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);
-        }
+        CustomButton cancelBtn = (CustomButton) findViewById(R.id.cancel);
+        CustomButton okBtn = (CustomButton) findViewById(R.id.ok);
         
         okBtn.setText(R.string.foreign_files_move);
         cancelBtn.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 c1bb9e2..eeb8b27 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
@@ -21,10 +21,10 @@ import android.app.Activity;
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
-import android.widget.Button;\r
 import android.widget.TextView;\r
 \r
 import de.mobilcom.debitel.cloud.android.R;\r
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;\r
 \r
 /**\r
  * This Activity is used to display a detail message for failed uploads\r
@@ -44,11 +44,7 @@ public class FailedUploadActivity extends Activity {
         String message = getIntent().getStringExtra(MESSAGE);\r
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);\r
         textView.setText(message);\r
-        Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);\r
-        // Set background of 'close' button\r
-        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
-        if (customButtons) \r
-            closeBtn.setBackgroundResource(R.drawable.btn_default);\r
+        CustomButton closeBtn = (CustomButton) findViewById(R.id.failed_uploadactivity_close_button);\r
         \r
         closeBtn.setOnClickListener(new OnClickListener() {\r
             @Override\r

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 6be111d..23cb6f0 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
@@ -47,6 +47,7 @@ import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
 import de.mobilcom.debitel.cloud.android.db.DbHandler;
 import de.mobilcom.debitel.cloud.android.files.InstantUploadBroadcastReceiver;
 import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 /**
@@ -76,21 +77,14 @@ public class InstantUploadActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.failed_upload_files);
 
-        Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn);
+        CustomButton deleteAllBtn = (CustomButton) findViewById(R.id.failed_upload_delete_all_btn);
         deleteAllBtn.setOnClickListener(getDeleteListner());
-        Button retryAllBtn = (Button) findViewById(R.id.failed_upload_retry_all_btn);
+        CustomButton retryAllBtn = (CustomButton) 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 0066bc1..20317bc 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
@@ -26,7 +26,6 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ListView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -34,6 +33,7 @@ import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.MenuItem;
 
 import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import de.mobilcom.debitel.cloud.android.ui.adapter.LogListAdapter;
 import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
@@ -52,13 +52,8 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         ListView listView = (ListView) findViewById(android.R.id.list);
-        Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
+        CustomButton deleteHistoryButton = (CustomButton) 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 5cd1a79..37e763d 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -35,7 +36,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -45,7 +45,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     public final static String EXTRA_ACTIVITY = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.ACTIVITY";
     public final static String EXTRA_NEW_STATE = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.NEW_STATE";
     
-    Button bCancel;
+    CustomButton bCancel;
     TextView mPinHdr;
     TextView mPinHdrExplanation;
     EditText mText1;
@@ -71,7 +71,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         Intent intent = getIntent();
         activity = intent.getStringExtra(EXTRA_ACTIVITY);
      
-        bCancel = (Button) findViewById(R.id.cancel);
+        bCancel = (CustomButton) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
         mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
         mText1 = (EditText) findViewById(R.id.txt1);
@@ -81,11 +81,6 @@ 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 49d9b84..6d0c88d 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -38,6 +37,7 @@ import com.actionbarsherlock.view.MenuItem;
 
 import de.mobilcom.debitel.cloud.android.Log_OC;
 import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog;
 import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment;
 import de.mobilcom.debitel.cloud.android.ui.fragment.LocalFileListFragment;
@@ -58,8 +58,8 @@ public class UploadFilesActivity extends FileActivity implements
     private ArrayAdapter<String> mDirectories;
     private File mCurrentDir = null;
     private LocalFileListFragment mFileListFragment;
-    private Button mCancelBtn;
-    private Button mUploadBtn;
+    private CustomButton mCancelBtn;
+    private CustomButton mUploadBtn;
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
     
@@ -103,17 +103,11 @@ public class UploadFilesActivity extends FileActivity implements
         
         
         // Set input controllers
-        mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
+        mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel);
         mCancelBtn.setOnClickListener(this);
-        mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
+        mUploadBtn = (CustomButton) 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();

diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
index 2b6f168..f75b984 100644 (file)
--- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
@@ -34,7 +34,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.TextView;
 
 import de.mobilcom.debitel.cloud.android.Log_OC;
@@ -42,6 +41,7 @@ import de.mobilcom.debitel.cloud.android.R;
 import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException;
 import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
 import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 
 /**
  * Dialog to request the user about a certificate that could not be validated with the certificates store in the system.
@@ -142,11 +142,11 @@ public class SslValidatorDialog extends Dialog {
                        View detailsScroll = findViewById(R.id.details_scroll);
                        if (detailsScroll.getVisibility() == View.VISIBLE) {
                            detailsScroll.setVisibility(View.GONE);
-                           ((Button)v).setText(R.string.ssl_validator_btn_details_see);
+                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_see);
                            
                        } else {
                            detailsScroll.setVisibility(View.VISIBLE);
-                           ((Button)v).setText(R.string.ssl_validator_btn_details_hide);
+                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_hide);
                        }
                     }
                 });