cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Class names and string names are updated

Browse Source
This commit is contained in:
rohands
2015-09-22 23:06:26 +05:30
parent afbf2b36cf
commit 8703b5f4a9
6 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -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) {

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -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() {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/LongClick.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java
View File

@@ -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() {

2
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@@ -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>

8
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -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"

10
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>