aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-05-06 19:18:32 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-05-06 19:18:32 +0200
commit0d05ff98cb7ef992a040e7040c4fc534307e51e8 (patch)
tree8550eb16ce11a86af9a35bbbb22a01c4fe781f37 /OpenKeychain/src/main/java
parentd52d4553177a2c82cefe68fa26fdf8b94628bc93 (diff)
downloadopen-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.tar.gz
open-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.tar.bz2
open-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.zip
ui: use textviews instead of bootstrap buttons in SignEncrypt
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java15
2 files changed, 9 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
index b8ac59dac..d150abdeb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
@@ -67,7 +67,7 @@ public class EncryptFileFragment extends Fragment {
private CheckBox mDeleteAfter = null;
private CheckBox mShareAfter = null;
private BootstrapButton mBrowse = null;
- private BootstrapButton mEncryptFile;
+ private View mEncryptFile;
private FileDialogFragment mFileDialog;
@@ -92,7 +92,7 @@ public class EncryptFileFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.encrypt_file_fragment, container, false);
- mEncryptFile = (BootstrapButton) view.findViewById(R.id.action_encrypt_file);
+ mEncryptFile = view.findViewById(R.id.action_encrypt_file);
mEncryptFile.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
index 0a1a3474a..4c35806e5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
@@ -28,9 +28,8 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.EditText;
+import android.widget.TextView;
-import com.beardedhen.androidbootstrap.BootstrapButton;
import com.devspark.appmsg.AppMsg;
import org.sufficientlysecure.keychain.Constants;
@@ -46,9 +45,9 @@ import org.sufficientlysecure.keychain.util.Log;
public class EncryptMessageFragment extends Fragment {
public static final String ARG_TEXT = "text";
- private EditText mMessage = null;
- private BootstrapButton mEncryptShare;
- private BootstrapButton mEncryptClipboard;
+ private TextView mMessage = null;
+ private View mEncryptShare;
+ private View mEncryptClipboard;
private EncryptActivityInterface mEncryptInterface;
@@ -70,9 +69,9 @@ public class EncryptMessageFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.encrypt_message_fragment, container, false);
- mMessage = (EditText) view.findViewById(R.id.message);
- mEncryptClipboard = (BootstrapButton) view.findViewById(R.id.action_encrypt_clipboard);
- mEncryptShare = (BootstrapButton) view.findViewById(R.id.action_encrypt_share);
+ mMessage = (TextView) view.findViewById(R.id.message);
+ mEncryptClipboard = view.findViewById(R.id.action_encrypt_clipboard);
+ mEncryptShare = view.findViewById(R.id.action_encrypt_share);
mEncryptClipboard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {