Use flat buttons where appropriate

3 files changed, 10 insertions, 14 deletions

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<Cursor> {
-    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<String> adapter = new ArrayAdapter<String>(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<String> adapter = new ArrayAdapter<String>(this,
                 android.R.layout.simple_spinner_item, Preferences.getPreferences(this)