From: masensio Date: Wed, 30 Oct 2013 16:29:22 +0000 (+0100) Subject: Update image buttons and remove CustomButton class X-Git-Tag: oc-android-1.5.5~139^2~8 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4849affc6f7804623d649939204c50e999f9cc90?ds=inline;hp=--cc Update image buttons and remove CustomButton class --- 4849affc6f7804623d649939204c50e999f9cc90 diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png deleted file mode 100644 index f90d47bc..00000000 Binary files a/res/drawable-hdpi/btn_default_disabled.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_default_disabled_focused.9.png b/res/drawable-hdpi/btn_default_disabled_focused.9.png deleted file mode 100644 index 56dfd15d..00000000 Binary files a/res/drawable-hdpi/btn_default_disabled_focused.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_default_enabled.9.png b/res/drawable-hdpi/btn_default_enabled.9.png deleted file mode 100644 index 0af44831..00000000 Binary files a/res/drawable-hdpi/btn_default_enabled.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_default_focused.9.png b/res/drawable-hdpi/btn_default_focused.9.png deleted file mode 100644 index 06b7790f..00000000 Binary files a/res/drawable-hdpi/btn_default_focused.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_default_pressed.9.png b/res/drawable-hdpi/btn_default_pressed.9.png deleted file mode 100644 index 4312c27f..00000000 Binary files a/res/drawable-hdpi/btn_default_pressed.9.png and /dev/null differ diff --git a/res/drawable-ldpi/btn_default_disabled.9.png b/res/drawable-ldpi/btn_default_disabled.9.png deleted file mode 100644 index d549e5a6..00000000 Binary files a/res/drawable-ldpi/btn_default_disabled.9.png and /dev/null differ diff --git a/res/drawable-ldpi/btn_default_disabled_focused.9.png b/res/drawable-ldpi/btn_default_disabled_focused.9.png deleted file mode 100644 index 3fd67eb9..00000000 Binary files a/res/drawable-ldpi/btn_default_disabled_focused.9.png and /dev/null differ diff --git a/res/drawable-ldpi/btn_default_enabled.9.png b/res/drawable-ldpi/btn_default_enabled.9.png deleted file mode 100644 index 04b12c64..00000000 Binary files a/res/drawable-ldpi/btn_default_enabled.9.png and /dev/null differ diff --git a/res/drawable-ldpi/btn_default_focused.9.png b/res/drawable-ldpi/btn_default_focused.9.png deleted file mode 100644 index a09da007..00000000 Binary files a/res/drawable-ldpi/btn_default_focused.9.png and /dev/null differ diff --git a/res/drawable-ldpi/btn_default_pressed.9.png b/res/drawable-ldpi/btn_default_pressed.9.png deleted file mode 100644 index f5a21b21..00000000 Binary files a/res/drawable-ldpi/btn_default_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_default_disabled.9.png b/res/drawable-mdpi/btn_default_disabled.9.png deleted file mode 100644 index 38d0160e..00000000 Binary files a/res/drawable-mdpi/btn_default_disabled.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_default_disabled_focused.9.png b/res/drawable-mdpi/btn_default_disabled_focused.9.png deleted file mode 100644 index 552d2a18..00000000 Binary files a/res/drawable-mdpi/btn_default_disabled_focused.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_default_enabled.9.png b/res/drawable-mdpi/btn_default_enabled.9.png deleted file mode 100644 index a1c40458..00000000 Binary files a/res/drawable-mdpi/btn_default_enabled.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_default_focused.9.png b/res/drawable-mdpi/btn_default_focused.9.png deleted file mode 100644 index 415b1456..00000000 Binary files a/res/drawable-mdpi/btn_default_focused.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_default_pressed.9.png b/res/drawable-mdpi/btn_default_pressed.9.png deleted file mode 100644 index 74fd58b5..00000000 Binary files a/res/drawable-mdpi/btn_default_pressed.9.png and /dev/null differ diff --git a/res/drawable/btn_default.xml b/res/drawable/btn_default.xml deleted file mode 100644 index ebf44cac..00000000 --- a/res/drawable/btn_default.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml index bb13c5f7..48925beb 100644 --- a/res/layout/pincodelock.xml +++ b/res/layout/pincodelock.xml @@ -18,7 +18,7 @@ along with this program. If not, see . --> #DDDDDD #00ddff - #84bc34 - #a0d92d - #83b324 - #e3e3e3 - \ No newline at end of file diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java index ddd3f4ca..8e69516e 100644 --- a/src/com/owncloud/android/Uploader.java +++ b/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); } diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 69872d73..f6e67802 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/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); diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java index efd4e01f..11e73c24 100644 --- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java +++ b/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); diff --git a/src/com/owncloud/android/ui/CustomButton.java b/src/com/owncloud/android/ui/CustomButton.java deleted file mode 100644 index ab4db65d..00000000 --- a/src/com/owncloud/android/ui/CustomButton.java +++ /dev/null @@ -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); - } - } - -} diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index fc9afcde..056ffd6c 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/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); diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java index 76f2ba41..33432cfb 100644 --- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java +++ b/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 diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index ce7ef798..a851dd18 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/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()); diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 0aa84753..e879cc7e 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/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() { diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java index 068461a8..c962fb2f 100644 --- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java +++ b/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); diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 44e44221..7196b138 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/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; diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index ab7bb463..cc1f7de1 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/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 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); diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index 82ecd6bc..1ccc8fa8 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/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); } } });