diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index dab079089..fb59257ca 100644 --- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -1,10 +1,10 @@ package eu.siacs.conversations.ui; import android.support.v7.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.v4.content.ContextCompat; +import android.support.v7.widget.SwitchCompat; import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; @@ -22,7 +22,6 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.ui.widget.Switch; import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.utils.zxing.IntentIntegrator; @@ -117,12 +116,7 @@ public abstract class OmemoActivity extends XmppActivity { session.getTrust(), true, true, - new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - account.getAxolotlService().setFingerprintTrust(fingerprint, FingerprintStatus.createActive(isChecked)); - } - }); + (buttonView, isChecked) -> account.getAxolotlService().setFingerprintTrust(fingerprint, FingerprintStatus.createActive(isChecked))); } protected void addFingerprintRowWithListeners(LinearLayout keys, final Account account, @@ -134,20 +128,14 @@ public abstract class OmemoActivity extends XmppActivity { CompoundButton.OnCheckedChangeListener onCheckedChangeListener) { View view = getLayoutInflater().inflate(R.layout.contact_key, keys, false); - TextView key = (TextView) view.findViewById(R.id.key); - TextView keyType = (TextView) view.findViewById(R.id.key_type); + TextView key = view.findViewById(R.id.key); + TextView keyType = view.findViewById(R.id.key_type); if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) { - View.OnClickListener listener = new View.OnClickListener() { - @Override - public void onClick(View v) { - showX509Certificate(account,fingerprint); - } - }; - key.setOnClickListener(listener); - keyType.setOnClickListener(listener); + key.setOnClickListener(v -> showX509Certificate(account,fingerprint)); + keyType.setOnClickListener(v -> showX509Certificate(account,fingerprint)); } - Switch trustToggle = (Switch) view.findViewById(R.id.tgl_trust); - ImageView verifiedFingerprintSymbol = (ImageView) view.findViewById(R.id.verified_fingerprint); + SwitchCompat trustToggle = view.findViewById(R.id.tgl_trust); + ImageView verifiedFingerprintSymbol = view.findViewById(R.id.verified_fingerprint); trustToggle.setVisibility(View.VISIBLE); registerForContextMenu(view); view.setTag(R.id.TAG_ACCOUNT,account); @@ -155,7 +143,7 @@ public abstract class OmemoActivity extends XmppActivity { view.setTag(R.id.TAG_FINGERPRINT_STATUS,status); boolean x509 = Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509; final View.OnClickListener toast; - trustToggle.setChecked(status.isTrusted(), false); + trustToggle.setChecked(status.isTrusted()); if (status.isActive()){ key.setTextColor(getPrimaryTextColor()); @@ -164,47 +152,29 @@ public abstract class OmemoActivity extends XmppActivity { verifiedFingerprintSymbol.setVisibility(View.VISIBLE); verifiedFingerprintSymbol.setAlpha(1.0f); trustToggle.setVisibility(View.GONE); - verifiedFingerprintSymbol.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - replaceToast(getString(R.string.this_device_has_been_verified), false); - } - }); + verifiedFingerprintSymbol.setOnClickListener(v -> replaceToast(getString(R.string.this_device_has_been_verified), false)); toast = null; } else { verifiedFingerprintSymbol.setVisibility(View.GONE); trustToggle.setVisibility(View.VISIBLE); trustToggle.setOnCheckedChangeListener(onCheckedChangeListener); if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) { - trustToggle.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false)); - v.setEnabled(true); - v.setOnClickListener(null); - } + trustToggle.setOnClickListener(v -> { + account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false)); + v.setEnabled(true); + v.setOnClickListener(null); }); trustToggle.setEnabled(false); } else { trustToggle.setOnClickListener(null); trustToggle.setEnabled(true); } - toast = new View.OnClickListener() { - @Override - public void onClick(View v) { - hideToast(); - } - }; + toast = v -> hideToast(); } } else { key.setTextColor(getTertiaryTextColor()); keyType.setTextColor(getTertiaryTextColor()); - toast = new View.OnClickListener() { - @Override - public void onClick(View v) { - replaceToast(getString(R.string.this_device_is_no_longer_in_use), false); - } - }; + toast = v -> replaceToast(getString(R.string.this_device_is_no_longer_in_use), false); if (status.isVerified()) { trustToggle.setVisibility(View.GONE); verifiedFingerprintSymbol.setVisibility(View.VISIBLE); @@ -245,12 +215,9 @@ public abstract class OmemoActivity extends XmppActivity { builder.setMessage(R.string.distrust_omemo_key_text); builder.setNegativeButton(getString(R.string.cancel), null); builder.setPositiveButton(R.string.confirm, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - account.getAxolotlService().distrustFingerprint(fingerprint); - refreshUi(); - } + (dialog, which) -> { + account.getAxolotlService().distrustFingerprint(fingerprint); + refreshUi(); }); builder.create().show(); } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index bbcf51c9d..de27c8b65 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; +import android.support.v7.widget.SwitchCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -23,7 +24,6 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.ui.ManageAccountActivity; import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.ui.widget.Switch; import eu.siacs.conversations.utils.UIHelper; public class AccountAdapter extends ArrayAdapter { @@ -51,14 +51,14 @@ public class AccountAdapter extends ArrayAdapter { .getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = inflater.inflate(R.layout.account_row, parent, false); } - TextView jid = (TextView) view.findViewById(R.id.account_jid); + TextView jid = view.findViewById(R.id.account_jid); if (Config.DOMAIN_LOCK != null) { jid.setText(account.getJid().getLocalpart()); } else { jid.setText(account.getJid().toBareJid().toString()); } - TextView statusView = (TextView) view.findViewById(R.id.account_status); - ImageView imageView = (ImageView) view.findViewById(R.id.account_image); + TextView statusView = view.findViewById(R.id.account_status); + ImageView imageView = view.findViewById(R.id.account_image); loadAvatar(account,imageView); statusView.setText(getContext().getString(account.getStatus().getReadableId())); switch (account.getStatus()) { @@ -73,20 +73,18 @@ public class AccountAdapter extends ArrayAdapter { statusView.setTextColor(activity.getWarningTextColor()); break; } - final Switch tglAccountState = (Switch) view.findViewById(R.id.tgl_account_status); + final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status); final boolean isDisabled = (account.getStatus() == Account.State.DISABLED); - tglAccountState.setChecked(!isDisabled,false); + tglAccountState.setOnCheckedChangeListener(null); + tglAccountState.setChecked(!isDisabled); if (this.showStateButton) { tglAccountState.setVisibility(View.VISIBLE); } else { tglAccountState.setVisibility(View.GONE); } - tglAccountState.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean b) { - if (b == isDisabled && activity instanceof ManageAccountActivity) { - ((ManageAccountActivity) activity).onClickTglAccountState(account,b); - } + tglAccountState.setOnCheckedChangeListener((compoundButton, b) -> { + if (b == isDisabled && activity instanceof ManageAccountActivity) { + ((ManageAccountActivity) activity).onClickTglAccountState(account,b); } }); return view; diff --git a/src/main/java/eu/siacs/conversations/ui/widget/Switch.java b/src/main/java/eu/siacs/conversations/ui/widget/Switch.java deleted file mode 100644 index fd3b5553f..000000000 --- a/src/main/java/eu/siacs/conversations/ui/widget/Switch.java +++ /dev/null @@ -1,68 +0,0 @@ -package eu.siacs.conversations.ui.widget; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.ViewConfiguration; - -import com.kyleduo.switchbutton.SwitchButton; - -public class Switch extends SwitchButton { - - private int mTouchSlop; - private int mClickTimeout; - private float mStartX; - private float mStartY; - private OnClickListener mOnClickListener; - - public Switch(Context context) { - super(context); - mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); - mClickTimeout = ViewConfiguration.getPressedStateDuration() + ViewConfiguration.getTapTimeout(); - } - - public Switch(Context context, AttributeSet attrs) { - super(context, attrs); - mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); - mClickTimeout = ViewConfiguration.getPressedStateDuration() + ViewConfiguration.getTapTimeout(); - } - - public Switch(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); - mClickTimeout = ViewConfiguration.getPressedStateDuration() + ViewConfiguration.getTapTimeout(); - } - - @Override - public void setOnClickListener(OnClickListener onClickListener) { - this.mOnClickListener = onClickListener; - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - if (!isEnabled()) { - float deltaX = event.getX() - mStartX; - float deltaY = event.getY() - mStartY; - int action = event.getAction(); - switch (action) { - case MotionEvent.ACTION_DOWN: - mStartX = event.getX(); - mStartY = event.getY(); - break; - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: - float time = event.getEventTime() - event.getDownTime(); - if (deltaX < mTouchSlop && deltaY < mTouchSlop && time < mClickTimeout) { - if (mOnClickListener != null) { - this.mOnClickListener.onClick(this); - } - } - break; - default: - break; - } - return true; - } - return super.onTouchEvent(event); - } -} diff --git a/src/main/res/drawable-hdpi/switch_thumb_disable.png b/src/main/res/drawable-hdpi/switch_thumb_disable.png deleted file mode 100644 index 1e9b151b6..000000000 Binary files a/src/main/res/drawable-hdpi/switch_thumb_disable.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png b/src/main/res/drawable-hdpi/switch_thumb_off_normal.png deleted file mode 100644 index b7c1fc11a..000000000 Binary files a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png deleted file mode 100644 index ca6e49096..000000000 Binary files a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png b/src/main/res/drawable-hdpi/switch_thumb_on_normal.png deleted file mode 100644 index cbcda5d47..000000000 Binary files a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png deleted file mode 100644 index 234b12dc4..000000000 Binary files a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/switch_thumb_disable.png b/src/main/res/drawable-mdpi/switch_thumb_disable.png deleted file mode 100644 index 968de345d..000000000 Binary files a/src/main/res/drawable-mdpi/switch_thumb_disable.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png b/src/main/res/drawable-mdpi/switch_thumb_off_normal.png deleted file mode 100644 index 51fb4d7a2..000000000 Binary files a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png deleted file mode 100644 index ca7884453..000000000 Binary files a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png b/src/main/res/drawable-mdpi/switch_thumb_on_normal.png deleted file mode 100644 index 6a93d5f75..000000000 Binary files a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png deleted file mode 100644 index e8d7bd0f0..000000000 Binary files a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/switch_thumb_disable.png b/src/main/res/drawable-xhdpi/switch_thumb_disable.png deleted file mode 100644 index 7f6773248..000000000 Binary files a/src/main/res/drawable-xhdpi/switch_thumb_disable.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png deleted file mode 100644 index 4199d322b..000000000 Binary files a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png deleted file mode 100644 index 2b86888f3..000000000 Binary files a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png deleted file mode 100644 index daa309900..000000000 Binary files a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png deleted file mode 100644 index 6aab47c99..000000000 Binary files a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxhdpi/switch_thumb_disable.png deleted file mode 100644 index db7c1df41..000000000 Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png deleted file mode 100644 index f747b5596..000000000 Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png deleted file mode 100644 index b9fe6d469..000000000 Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png deleted file mode 100644 index 881990248..000000000 Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png deleted file mode 100644 index 7a4fed540..000000000 Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png deleted file mode 100644 index 3970168ca..000000000 Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png deleted file mode 100644 index ea8d4f894..000000000 Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png deleted file mode 100644 index 84d667b13..000000000 Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png deleted file mode 100644 index 06b190eb9..000000000 Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png deleted file mode 100644 index 79c30d1e5..000000000 Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png and /dev/null differ diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml deleted file mode 100644 index 20d2fb146..000000000 --- a/src/main/res/drawable/switch_back_off.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml deleted file mode 100644 index 45117a98e..000000000 --- a/src/main/res/drawable/switch_back_on.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml deleted file mode 100644 index ba3d1c456..000000000 --- a/src/main/res/drawable/switch_thumb.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 605f63efd..bf6893e28 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -46,8 +46,7 @@ android:textStyle="bold" /> - - diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e8572d9d4..70c333111 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -4,18 +4,4 @@ 1.5dp @color/black12 - - \ No newline at end of file