diff options
Diffstat (limited to 'src/main')
32 files changed, 18 insertions, 179 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java b/src/main/java/de/pixart/messenger/ui/OmemoActivity.java index a1a156fb9..e304a64ee 100644 --- a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java +++ b/src/main/java/de/pixart/messenger/ui/OmemoActivity.java @@ -1,11 +1,12 @@ package de.pixart.messenger.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.app.AlertDialog; +import android.support.v7.widget.SwitchCompat; import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; @@ -23,7 +24,6 @@ import de.pixart.messenger.R; import de.pixart.messenger.crypto.axolotl.FingerprintStatus; import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; import de.pixart.messenger.entities.Account; -import de.pixart.messenger.ui.widget.Switch; import de.pixart.messenger.utils.CryptoHelper; import de.pixart.messenger.utils.XmppUri; import de.pixart.messenger.utils.zxing.IntentIntegrator; @@ -116,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, @@ -137,16 +132,10 @@ public abstract class OmemoActivity extends XmppActivity { 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 = view.findViewById(R.id.tgl_trust); + SwitchCompat trustToggle = view.findViewById(R.id.tgl_trust); ImageView verifiedFingerprintSymbol = view.findViewById(R.id.verified_fingerprint); trustToggle.setVisibility(View.VISIBLE); registerForContextMenu(view); @@ -155,7 +144,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 +153,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 +216,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/de/pixart/messenger/ui/widget/Switch.java b/src/main/java/de/pixart/messenger/ui/widget/Switch.java deleted file mode 100644 index 40d8f4c99..000000000 --- a/src/main/java/de/pixart/messenger/ui/widget/Switch.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.pixart.messenger.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 Binary files differdeleted file mode 100644 index edf2a0cb6..000000000 --- a/src/main/res/drawable-hdpi/switch_thumb_disable.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png b/src/main/res/drawable-hdpi/switch_thumb_off_normal.png Binary files differdeleted file mode 100644 index e68516df5..000000000 --- a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png Binary files differdeleted file mode 100644 index 66a71eed8..000000000 --- a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png b/src/main/res/drawable-hdpi/switch_thumb_on_normal.png Binary files differdeleted file mode 100644 index 07b504b8a..000000000 --- a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png Binary files differdeleted file mode 100644 index 2afb5d515..000000000 --- a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/switch_thumb_disable.png b/src/main/res/drawable-mdpi/switch_thumb_disable.png Binary files differdeleted file mode 100644 index 5aca01b01..000000000 --- a/src/main/res/drawable-mdpi/switch_thumb_disable.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png b/src/main/res/drawable-mdpi/switch_thumb_off_normal.png Binary files differdeleted file mode 100644 index b077942d0..000000000 --- a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png Binary files differdeleted file mode 100644 index 31a66b563..000000000 --- a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png b/src/main/res/drawable-mdpi/switch_thumb_on_normal.png Binary files differdeleted file mode 100644 index a20e6c03c..000000000 --- a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png Binary files differdeleted file mode 100644 index f8ee1b838..000000000 --- a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/switch_thumb_disable.png b/src/main/res/drawable-xhdpi/switch_thumb_disable.png Binary files differdeleted file mode 100644 index e416b4feb..000000000 --- a/src/main/res/drawable-xhdpi/switch_thumb_disable.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png Binary files differdeleted file mode 100644 index 230a84bc0..000000000 --- a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png Binary files differdeleted file mode 100644 index e80086d99..000000000 --- a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png Binary files differdeleted file mode 100644 index a771329d7..000000000 --- a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png Binary files differdeleted file mode 100644 index cd88d6586..000000000 --- a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxhdpi/switch_thumb_disable.png Binary files differdeleted file mode 100644 index 3ff8a48dd..000000000 --- a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png Binary files differdeleted file mode 100644 index de02d19e5..000000000 --- a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png Binary files differdeleted file mode 100644 index 7dee139ef..000000000 --- a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png Binary files differdeleted file mode 100644 index de13a5993..000000000 --- a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png Binary files differdeleted file mode 100644 index 6c260776e..000000000 --- a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png Binary files differdeleted file mode 100644 index 865f11dbe..000000000 --- a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png Binary files differdeleted file mode 100644 index 268a63435..000000000 --- a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png Binary files differdeleted file mode 100644 index dc15d1838..000000000 --- a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png Binary files differdeleted file mode 100644 index e66b72411..000000000 --- a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png Binary files differdeleted file mode 100644 index eddb55bb8..000000000 --- a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png +++ /dev/null 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 9082347b2..000000000 --- a/src/main/res/drawable/switch_back_off.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_enabled="false"> - <shape android:shape="rectangle"> - <solid android:color="#D5D5D5" /> - - <corners android:radius="99dp" /> - </shape> - </item> - <item android:state_enabled="true"> - <shape android:shape="rectangle"> - <solid android:color="#939393" /> - - <corners android:radius="99dp" /> - </shape> - </item> - -</selector>
\ 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 ae78edecc..000000000 --- a/src/main/res/drawable/switch_back_on.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> - <shape android:shape="rectangle"> - <solid android:color="#D5D5D5" /> - <corners android:radius="99dp" /> - </shape> - </item> - <item android:state_enabled="true"> - <shape android:shape="rectangle"> - <!-- 30% accent on white --> - <solid android:color="#b3ddf7" /> - <corners android:radius="99dp" /> - </shape> - </item> -</selector>
\ 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 da33e46c3..000000000 --- a/src/main/res/drawable/switch_thumb.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false" /> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true" /> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true" /> - <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true" /> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true" /> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true" /> - <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false" /> - -</selector>
\ No newline at end of file diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 0edd1aea3..99d8732c3 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -78,7 +78,7 @@ android:layout_marginRight="16dp" android:src="@drawable/ic_verified_fingerprint" /> - <de.pixart.messenger.ui.widget.Switch + <android.support.v7.widget.SwitchCompat android:id="@+id/tgl_trust" android:visibility="gone" android:layout_width="wrap_content" diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 5c0808d04..c35a4c862 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,17 +1,3 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="MD"> - <item name="animationVelocity">6</item> - <item name="insetBottom">16dp</item> - <item name="insetTop">16dp</item> - <item name="insetLeft">16dp</item> - <item name="insetRight">16dp</item> - <item name="measureFactor">1.4</item> - <item name="offDrawable">@drawable/switch_back_off</item> - <item name="onDrawable">@drawable/switch_back_on</item> - <item name="thumbDrawable">@drawable/switch_thumb</item> - <item name="thumb_margin">-17dp</item> - <item name="android:padding">16dp</item> - </style> - </resources>
\ No newline at end of file |
