diff options
author | rohands <rohan0495@gmail.com> | 2015-09-22 23:06:26 +0530 |
---|---|---|
committer | rohands <rohan0495@gmail.com> | 2015-09-22 23:06:26 +0530 |
commit | 8703b5f4a9268f43531a57ab5d27ab879882b449 (patch) | |
tree | b71306009019b565fd5e4d5490b5c7b16cbec0dc /OpenKeychain/src/main | |
parent | afbf2b36cf07e3225e186f1ce555927e5240f100 (diff) | |
download | open-keychain-8703b5f4a9268f43531a57ab5d27ab879882b449.tar.gz open-keychain-8703b5f4a9268f43531a57ab5d27ab879882b449.tar.bz2 open-keychain-8703b5f4a9268f43531a57ab5d27ab879882b449.zip |
Class names and string names are updated
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 12 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java) | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_item.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
6 files changed, 20 insertions, 18 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 09d2b9fcf..2b6d786d4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -67,7 +67,7 @@ import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; -import org.sufficientlysecure.keychain.ui.util.LongClick; +import org.sufficientlysecure.keychain.ui.util.ContentDescriptionHint; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.FabContainer; import org.sufficientlysecure.keychain.util.Log; @@ -708,7 +708,7 @@ public class KeyListFragment extends LoaderFragment holder.mSlinger.setVisibility(View.VISIBLE); - LongClick.setup(holder.mSlingerButton); + ContentDescriptionHint.setup(holder.mSlingerButton); holder.mSlingerButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 6e30f7a22..a09e74abe 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -79,7 +79,7 @@ import org.sufficientlysecure.keychain.ui.linked.LinkedIdWizard; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State; -import org.sufficientlysecure.keychain.ui.util.LongClick; +import org.sufficientlysecure.keychain.ui.util.ContentDescriptionHint; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify.ActionListener; import org.sufficientlysecure.keychain.ui.util.Notify.Style; @@ -182,12 +182,12 @@ public class ViewKeyActivity extends BaseNfcActivity implements mRotateSpin = AnimationUtils.loadAnimation(this, R.anim.rotate_spin); - //Long Click Listeners implemented + //ContentDescriptionHint Listeners implemented - LongClick.setup(mActionEncryptFile); - LongClick.setup(mActionEncryptText); - LongClick.setup(mActionNfc); - LongClick.setup(mFab); + ContentDescriptionHint.setup(mActionEncryptFile); + ContentDescriptionHint.setup(mActionEncryptText); + ContentDescriptionHint.setup(mActionNfc); + ContentDescriptionHint.setup(mFab); mRotateSpin.setAnimationListener(new AnimationListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java index 5b0bcbb78..8e45a20e9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java @@ -25,7 +25,7 @@ import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.Toast; -public class LongClick { +public class ContentDescriptionHint { private static final int ESTIMATED_TOAST_HEIGHT_DIPS = 48; public static void setup(View view) { view.setOnLongClickListener(new View.OnLongClickListener() { diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 88c19c1a6..d9e7170c5 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -124,7 +124,7 @@ android:src="@drawable/ic_repeat_grey_24dp" android:padding="12dp" android:background="?android:selectableItemBackground" - android:contentDescription="@string/exchange_keys"/> + android:contentDescription="@string/cd_exchange_keys"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index a6f9fd17f..7c021bec2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -94,7 +94,7 @@ <ImageButton android:id="@+id/view_key_action_encrypt_files" - android:contentDescription="@string/encrypt_files" + android:contentDescription="@string/cd_encrypt_files" style="?android:attr/borderlessButtonStyle" android:layout_width="64dp" android:layout_height="64dp" @@ -104,7 +104,7 @@ <ImageButton android:id="@+id/view_key_action_encrypt_text" - android:contentDescription="@string/encrypt_text" + android:contentDescription="@string/cd_encrypt_text" style="?android:attr/borderlessButtonStyle" android:layout_width="64dp" android:layout_height="64dp" @@ -115,7 +115,7 @@ <ImageButton android:id="@+id/view_key_action_nfc" style="?android:attr/borderlessButtonStyle" - android:contentDescription="@string/share_nfc" + android:contentDescription="@string/cd_share_nfc" android:layout_width="64dp" android:layout_height="64dp" android:src="@drawable/ic_nfc_white_24dp" @@ -216,7 +216,7 @@ <android.support.design.widget.FloatingActionButton android:id="@+id/fab" - android:contentDescription="@string/exchange_keys" + android:contentDescription="@string/cd_exchange_keys" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="24dp" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 1195e778e..312bf4023 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -99,10 +99,12 @@ <string name="btn_add_keyserver">"Add"</string> <string name="btn_save_default">"Save as default"</string> <string name="btn_saved">"Saved!"</string> - <string name="exchange_keys">"Exchange Keys"</string> - <string name="encrypt_files">"Encrypt Files"</string> - <string name="encrypt_text">"Encrypt Text"</string> - <string name="share_nfc">"Share Via NFC"</string> + + <!-- Content Description --> + <string name="cd_encrypt_files">"Encrypt Files"</string> + <string name="cd_exchange_keys">"Exchange Keys"</string> + <string name="cd_encrypt_text">"Encrypt Text"</string> + <string name="cd_share_nfc">"Share Via NFC"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> |