Update image buttons and remove CustomButton class

res/drawable/btn_default.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012-2013  ownCloud Inc.
-  
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/btn_default_enabled" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/btn_default_disabled" />
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_default_pressed" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/btn_default_focused" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_default_enabled" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_default_disabled_focused" />
-    <item
-         android:drawable="@drawable/btn_default_disabled" />
-</selector>

res/layout/pincodelock.xml

@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/de.mobilcom.debitel.cloud.android"
+    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"

res/values/colors.xml

@@ -22,9 +22,4 @@
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="owncloud_blue_bright">#00ddff</color>
     
-    <color name="freenet_green_01">#84bc34</color>
-    <color name="freenet_green_02">#a0d92d</color>
-    <color name="mdcloud_green">#83b324</color>
-    <color name="mdcloud_grey">#e3e3e3</color> <!-- login background color -->
-    
 </resources>

src/com/owncloud/android/Uploader.java

@@ -32,7 +32,6 @@ import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.ui.CustomButton;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -57,6 +56,7 @@ 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;
@@ -311,7 +311,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                                                 new String[] {"dirname"},
                                                 new int[] {R.id.textView1});
             setListAdapter(sa);
-            CustomButton btn = (CustomButton) findViewById(R.id.uploader_choose_folder);
+            Button btn = (Button) findViewById(R.id.uploader_choose_folder);
             btn.setOnClickListener(this);
             getListView().setOnItemClickListener(this);
         }

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -63,7 +63,6 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
@@ -188,7 +187,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);
-        mOkButton = (CustomButton) findViewById(R.id.buttonOK);
+        mOkButton = findViewById(R.id.buttonOK);
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); 
         
         /// set Host Url Input Enabled
@@ -200,11 +199,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (b != null) {
             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);

src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java

@@ -20,7 +20,6 @@ package com.owncloud.android.extensions;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
-import com.owncloud.android.ui.CustomButton;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -29,6 +28,7 @@ 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 {
@@ -41,8 +41,8 @@ public class ExtensionsAvailableDialog extends DialogFragment implements
             Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.extensions_available_dialog,
                 container);
-        CustomButton btnYes = (CustomButton) view.findViewById(R.id.buttonYes);
-        CustomButton btnNo = (CustomButton) view.findViewById(R.id.buttonNo);
+        Button btnYes = (Button) view.findViewById(R.id.buttonYes);
+        Button btnNo = (Button) view.findViewById(R.id.buttonNo);
         
         btnYes.setOnClickListener(this);
         btnNo.setOnClickListener(this);

src/com/owncloud/android/ui/CustomButton.java

@@ -1,46 +0,0 @@
-package com.owncloud.android.ui;
-
-import com.owncloud.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);
-        }
-    }
-
-}

src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java

@@ -33,6 +33,7 @@ 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;
@@ -42,7 +43,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.ui.CustomButton;
+
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.utils.FileStorageUtils;
 
@@ -117,8 +118,8 @@ public class ErrorsWhileCopyingHandlerActivity  extends SherlockFragmentActivity
         }
         
         /// customize buttons
-        CustomButton cancelBtn = (CustomButton) findViewById(R.id.cancel);
-        CustomButton okBtn = (CustomButton) findViewById(R.id.ok);
+        Button cancelBtn = (Button) findViewById(R.id.cancel);
+        Button okBtn = (Button) findViewById(R.id.ok);
         
         okBtn.setText(R.string.foreign_files_move);
         cancelBtn.setOnClickListener(this);

src/com/owncloud/android/ui/activity/FailedUploadActivity.java

@@ -18,12 +18,12 @@
 package com.owncloud.android.ui.activity;
 
 import com.owncloud.android.R;
-import com.owncloud.android.ui.CustomButton;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.TextView;
 
 
@@ -45,7 +45,7 @@ public class FailedUploadActivity extends Activity {
         String message = getIntent().getStringExtra(MESSAGE);
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);
         textView.setText(message);
-        CustomButton closeBtn = (CustomButton) findViewById(R.id.failed_uploadactivity_close_button);
+        Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);
         
         closeBtn.setOnClickListener(new OnClickListener() {
             @Override

src/com/owncloud/android/ui/activity/InstantUploadActivity.java

@@ -25,7 +25,6 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;
 import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import android.accounts.Account;
@@ -78,9 +77,9 @@ public class InstantUploadActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.failed_upload_files);
 
-        CustomButton deleteAllBtn = (CustomButton) findViewById(R.id.failed_upload_delete_all_btn);
+        Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn);
         deleteAllBtn.setOnClickListener(getDeleteListner());
-        CustomButton retryAllBtn = (CustomButton) findViewById(R.id.failed_upload_retry_all_btn);
+        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());

src/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -26,13 +26,13 @@ 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;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
-import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.adapter.LogListAdapter;
 import com.owncloud.android.utils.FileStorageUtils;
 
@@ -52,7 +52,7 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         ListView listView = (ListView) findViewById(android.R.id.list);
-        CustomButton deleteHistoryButton = (CustomButton) findViewById(R.id.deleteLogHistoryButton);
+        Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
         
         deleteHistoryButton.setOnClickListener(new OnClickListener() {
             

src/com/owncloud/android/ui/activity/PinCodeActivity.java

@@ -20,8 +20,6 @@ import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
-import com.owncloud.android.ui.CustomButton;
-
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -36,6 +34,7 @@ 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 +44,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY";
     public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";
     
-    CustomButton bCancel;
+    Button bCancel;
     TextView mPinHdr;
     TextView mPinHdrExplanation;
     EditText mText1;
@@ -71,7 +70,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         Intent intent = getIntent();
         activity = intent.getStringExtra(EXTRA_ACTIVITY);
      
-        bCancel = (CustomButton) findViewById(R.id.cancel);
+        bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
         mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
         mText1 = (EditText) findViewById(R.id.txt1);

src/com/owncloud/android/ui/activity/Preferences.java

@@ -19,7 +19,6 @@ package com.owncloud.android.ui.activity;
 
 import java.util.Vector;
 
-import android.accounts.Account;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
@@ -41,7 +40,6 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.OwnCloudSession;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 
 

src/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -29,6 +29,7 @@ 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;
@@ -36,7 +37,6 @@ import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
-import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.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 CustomButton mCancelBtn;
-    private CustomButton mUploadBtn;
+    private Button mCancelBtn;
+    private Button mUploadBtn;
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
     
@@ -103,9 +103,9 @@ public class UploadFilesActivity extends FileActivity implements
         
         
         // Set input controllers
-        mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel);
+        mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
         mCancelBtn.setOnClickListener(this);
-        mUploadBtn = (CustomButton) findViewById(R.id.upload_files_btn_upload);
+        mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.setOnClickListener(this);
         
             

src/com/owncloud/android/ui/dialog/SslValidatorDialog.java

@@ -34,13 +34,13 @@ import com.owncloud.android.R;
 import com.owncloud.android.network.CertificateCombinedException;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.ui.CustomButton;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
+import android.widget.Button;
 import android.widget.TextView;
 
 
@@ -143,11 +143,11 @@ public class SslValidatorDialog extends Dialog {
                        View detailsScroll = findViewById(R.id.details_scroll);
                        if (detailsScroll.getVisibility() == View.VISIBLE) {
                            detailsScroll.setVisibility(View.GONE);
-                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_see);
+                           ((Button) v).setText(R.string.ssl_validator_btn_details_see);
                            
                        } else {
                            detailsScroll.setVisibility(View.VISIBLE);
-                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_hide);
+                           ((Button) v).setText(R.string.ssl_validator_btn_details_hide);
                        }
                     }
                 });