diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-14 20:41:49 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-14 20:41:49 +0100 |
commit | dfabf192a0ef3da114c6765a5202affe66076984 (patch) | |
tree | 760ad674edc4cfb88f3974efa29ff9e43466ec7c /src/main/res | |
parent | 7e0d33197a972c26f57e3c63df42c3f9dc779220 (diff) |
switch to switchcompat
Diffstat (limited to 'src/main/res')
30 files changed, 1 insertions, 62 deletions
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 |