diff options
12 files changed, 66 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateDnsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateDnsStep1Fragment.java index fedbe120d..4b23f0f06 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateDnsStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateDnsStep1Fragment.java @@ -84,6 +84,13 @@ public class AffirmationCreateDnsStep1Fragment extends Fragment { } }); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + mEditUri = (EditText) view.findViewById(R.id.affirmation_create_https_uri); mEditUri.addTextChangedListener(new TextWatcher() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep1Fragment.java index 7d0ba8937..2b00d7483 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep1Fragment.java @@ -84,6 +84,13 @@ public class AffirmationCreateHttpsStep1Fragment extends Fragment { } }); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + mEditUri = (EditText) view.findViewById(R.id.affirmation_create_https_uri); mEditUri.addTextChangedListener(new TextWatcher() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep2Fragment.java index 55a6be40c..2f9b77f4a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateHttpsStep2Fragment.java @@ -99,6 +99,13 @@ public class AffirmationCreateHttpsStep2Fragment extends Fragment { } }); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + mVerifyImage = (ImageView) view.findViewById(R.id.verify_image); mVerifyProgress = view.findViewById(R.id.verify_progress); mVerifyStatus = (TextView) view.findViewById(R.id.verify_status); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep1Fragment.java index 6b47631c0..995823499 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep1Fragment.java @@ -111,6 +111,13 @@ public class AffirmationCreateTwitterStep1Fragment extends Fragment { } }); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + mEditHandle = (EditText) view.findViewById(R.id.linked_create_twitter_handle); mEditHandle.setText("Valodim"); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep2Fragment.java index 8367d750b..fad8cadd4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep2Fragment.java @@ -86,6 +86,13 @@ public class AffirmationCreateTwitterStep2Fragment extends Fragment { } }); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + mVerifyImage = (ImageView) view.findViewById(R.id.verify_image); mVerifyProgress = view.findViewById(R.id.verify_progress); mVerifyStatus = (TextView) view.findViewById(R.id.verify_status); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep3Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep3Fragment.java index 3b4c38893..5ceda3342 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep3Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/affirmations/AffirmationCreateTwitterStep3Fragment.java @@ -101,6 +101,13 @@ public class AffirmationCreateTwitterStep3Fragment extends Fragment { mEditTweetPreview = (EditText) view.findViewById(R.id.linked_create_twitter_preview); mEditTweetPreview.setText(mFullString); + view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mAffirmationWizard.loadFragment(null, null, AffirmationWizard.FRAG_ACTION_TO_LEFT); + } + }); + view.findViewById(R.id.button_send).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml index f50a4d9be..aa5353366 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml @@ -82,14 +82,16 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" + android:clickable="true" + style="@style/SelectableItem" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml index b966c824b..8bc2ab4ce 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml @@ -97,14 +97,16 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" + android:clickable="true" + style="@style/SelectableItem" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml index 68555fa92..1938cb93a 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml @@ -149,15 +149,17 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml index 1ba8d46c4..a20e0d7ee 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml @@ -89,15 +89,17 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml index 61957aa9b..c81144029 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml @@ -103,16 +103,18 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" android:layout_gravity="center_vertical" /> <View diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml index 55d85490e..efa810be3 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml @@ -153,16 +153,18 @@ android:id="@+id/create_key_buttons"> <TextView - android:id="@+id/create_key_back_button" + android:id="@+id/back_button" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" android:layout_gravity="center_vertical" /> <View |