From 33cad382f96b673587e841932ea322a1dd6fa23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 8 May 2014 15:46:57 +0200 Subject: Use flat buttons where appropriate --- .../keychain/ui/CertifyKeyActivity.java | 10 ++-- .../keychain/ui/ImportKeysActivity.java | 4 +- .../keychain/ui/UploadKeyActivity.java | 10 ++-- .../main/res/drawable-hdpi/ic_action_download.png | Bin 0 -> 398 bytes .../main/res/drawable-hdpi/ic_action_upload.png | Bin 0 -> 356 bytes .../main/res/drawable-mdpi/ic_action_download.png | Bin 0 -> 324 bytes .../main/res/drawable-mdpi/ic_action_upload.png | Bin 0 -> 291 bytes .../main/res/drawable-xhdpi/ic_action_download.png | Bin 0 -> 552 bytes .../main/res/drawable-xhdpi/ic_action_upload.png | Bin 0 -> 477 bytes .../res/drawable-xxhdpi/ic_action_download.png | Bin 0 -> 650 bytes .../main/res/drawable-xxhdpi/ic_action_upload.png | Bin 0 -> 588 bytes .../src/main/res/layout/certify_key_activity.xml | 31 +++++++++--- .../src/main/res/layout/edit_key_activity.xml | 2 +- .../src/main/res/layout/import_keys_activity.xml | 23 ++++++--- .../src/main/res/layout/key_server_export.xml | 40 --------------- .../src/main/res/layout/upload_key_activity.xml | 55 +++++++++++++++++++++ 16 files changed, 106 insertions(+), 69 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png delete mode 100644 OpenKeychain/src/main/res/layout/key_server_export.xml create mode 100644 OpenKeychain/src/main/res/layout/upload_key_activity.xml diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index 29969ca55..bd12a3b52 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -29,7 +29,6 @@ import android.support.v4.app.LoaderManager; import android.support.v4.app.NavUtils; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; -import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.view.MenuItem; import android.view.View; @@ -42,7 +41,6 @@ import android.widget.ListView; import android.widget.Spinner; import android.widget.TextView; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.spongycastle.openpgp.PGPPublicKeyRing; @@ -68,7 +66,7 @@ import java.util.ArrayList; */ public class CertifyKeyActivity extends ActionBarActivity implements SelectSecretKeyLayoutFragment.SelectSecretKeyCallback, LoaderManager.LoaderCallbacks { - private BootstrapButton mSignButton; + private View mSignButton; private CheckBox mUploadKeyCheckbox; private Spinner mSelectKeyserverSpinner; @@ -95,7 +93,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements mSelectKeyFragment.setCallback(this); mSelectKeyFragment.setFilterCertify(true); - mSelectKeyserverSpinner = (Spinner) findViewById(R.id.sign_key_keyserver); + mSelectKeyserverSpinner = (Spinner) findViewById(R.id.upload_key_keyserver); ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, Preferences.getPreferences(this) .getKeyServers() @@ -122,7 +120,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements } }); - mSignButton = (BootstrapButton) findViewById(R.id.sign_key_sign_button); + mSignButton = findViewById(R.id.sign_key_sign_button); mSignButton.setOnClickListener(new OnClickListener() { @Override @@ -350,7 +348,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements // fill values for this action Bundle data = new Bundle(); - Spinner keyServer = (Spinner) findViewById(R.id.sign_key_keyserver); + Spinner keyServer = (Spinner) findViewById(R.id.upload_key_keyserver); String server = (String) keyServer.getSelectedItem(); data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, server); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index f71ef6d46..bb5d2e922 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -86,7 +86,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O private ImportKeysListFragment mListFragment; private String[] mNavigationStrings; private Fragment mCurrentFragment; - private BootstrapButton mImportButton; + private View mImportButton; private static final Class[] NAVIGATION_CLASSES = new Class[]{ ImportKeysServerFragment.class, @@ -111,7 +111,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O setContentView(R.layout.import_keys_activity); - mImportButton = (BootstrapButton) findViewById(R.id.import_import); + mImportButton = findViewById(R.id.import_import); mImportButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 90783aa8b..dbd1b7507 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -32,8 +32,6 @@ import android.widget.ArrayAdapter; import android.widget.Spinner; import android.widget.Toast; -import com.beardedhen.androidbootstrap.BootstrapButton; - import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; @@ -46,7 +44,7 @@ import org.sufficientlysecure.keychain.util.Log; * Sends the selected public key to a keyserver */ public class UploadKeyActivity extends ActionBarActivity { - private BootstrapButton mUploadButton; + private View mUploadButton; private Spinner mKeyServerSpinner; private Uri mDataUri; @@ -55,10 +53,10 @@ public class UploadKeyActivity extends ActionBarActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.key_server_export); + setContentView(R.layout.upload_key_activity); - mUploadButton = (BootstrapButton) findViewById(R.id.btn_export_to_server); - mKeyServerSpinner = (Spinner) findViewById(R.id.sign_key_keyserver); + mUploadButton = findViewById(R.id.upload_key_action_upload); + mKeyServerSpinner = (Spinner) findViewById(R.id.upload_key_keyserver); ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, Preferences.getPreferences(this) diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png new file mode 100644 index 000000000..1f3d06519 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png new file mode 100644 index 000000000..b53640176 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png new file mode 100644 index 000000000..c2ead0cef Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png new file mode 100644 index 000000000..5bef3ca81 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png new file mode 100644 index 000000000..38a3aeea6 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png new file mode 100644 index 000000000..27af9a43c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png new file mode 100644 index 000000000..ef7785a48 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png new file mode 100644 index 000000000..48a0cd149 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png differ diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index 6fd047187..bb43fa805 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -135,22 +135,37 @@ android:text="@string/label_send_key" /> - + + + android:layout_height="match_parent" + android:text="@string/key_view_action_certify" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_good" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index fc4422cf0..1ce5c096f 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -33,7 +33,7 @@ android:padding="4dp" android:text="@string/btn_set_passphrase" bootstrapbutton:bb_icon_left="fa-pencil" - bootstrapbutton:bb_type="info" /> + bootstrapbutton:bb_type="default" /> - + + + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_download" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/key_server_export.xml b/OpenKeychain/src/main/res/layout/key_server_export.xml deleted file mode 100644 index 6031bf7c7..000000000 --- a/OpenKeychain/src/main/res/layout/key_server_export.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml new file mode 100644 index 000000000..5a6f732d5 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3