diff --git a/art/md_switch_thumb_disable.svg b/art/md_switch_thumb_disable.svg deleted file mode 100644 index efd83c2d0..000000000 --- a/art/md_switch_thumb_disable.svg +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/art/md_switch_thumb_off_normal.svg b/art/md_switch_thumb_off_normal.svg deleted file mode 100644 index 25d1761db..000000000 --- a/art/md_switch_thumb_off_normal.svg +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/art/md_switch_thumb_off_pressed.svg b/art/md_switch_thumb_off_pressed.svg deleted file mode 100644 index 002b47815..000000000 --- a/art/md_switch_thumb_off_pressed.svg +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/art/md_switch_thumb_on_normal.svg b/art/md_switch_thumb_on_normal.svg deleted file mode 100644 index 5e8f90f39..000000000 --- a/art/md_switch_thumb_on_normal.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/art/md_switch_thumb_on_pressed.svg b/art/md_switch_thumb_on_pressed.svg deleted file mode 100644 index e0331e7b7..000000000 --- a/art/md_switch_thumb_on_pressed.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/art/render.rb b/art/render.rb index 1e36bba90..3ef6ea4c7 100755 --- a/art/render.rb +++ b/art/render.rb @@ -57,11 +57,6 @@ images = { 'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24], 'ic_notifications_white80.svg' => ['ic_notifications_white80', 24], 'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36], - 'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48], - 'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48], - 'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48], - 'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48], - 'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48], 'message_bubble_received.svg' => ['message_bubble_received.9', 0], 'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0], 'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0], diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index fb59257ca..0d8b69ee6 100644 --- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -9,6 +9,7 @@ import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; import android.widget.CompoundButton; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -130,6 +131,7 @@ public abstract class OmemoActivity extends XmppActivity { View view = getLayoutInflater().inflate(R.layout.contact_key, keys, false); TextView key = view.findViewById(R.id.key); TextView keyType = view.findViewById(R.id.key_type); + ImageButton enableUndecided = view.findViewById(R.id.button_enable_device); if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) { key.setOnClickListener(v -> showX509Certificate(account,fingerprint)); keyType.setOnClickListener(v -> showX509Certificate(account,fingerprint)); @@ -159,12 +161,13 @@ public abstract class OmemoActivity extends XmppActivity { trustToggle.setVisibility(View.VISIBLE); trustToggle.setOnCheckedChangeListener(onCheckedChangeListener); if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) { - trustToggle.setOnClickListener(v -> { + enableUndecided.setVisibility(View.VISIBLE); + enableUndecided.setOnClickListener(v -> { account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false)); - v.setEnabled(true); - v.setOnClickListener(null); + enableUndecided.setVisibility(View.GONE); + trustToggle.setVisibility(View.VISIBLE); }); - trustToggle.setEnabled(false); + trustToggle.setVisibility(View.GONE); } else { trustToggle.setOnClickListener(null); trustToggle.setEnabled(true); diff --git a/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png new file mode 100644 index 000000000..db0b31631 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png new file mode 100644 index 000000000..a52eb9467 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png new file mode 100644 index 000000000..f8f4f111e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png new file mode 100644 index 000000000..8e7ba807f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png new file mode 100644 index 000000000..917b6cf4a Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png new file mode 100644 index 000000000..5b863eba7 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png new file mode 100644 index 000000000..56c24d8d9 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png new file mode 100644 index 000000000..25b278a55 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png new file mode 100644 index 000000000..ec775ec68 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png new file mode 100644 index 000000000..3c039061f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png differ diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index aeb866a99..486b25637 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -51,7 +51,7 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/your_photo" android:orientation="vertical" - android:paddingLeft="8dp"> + android:paddingLeft="@dimen/avatar_item_distance"> + android:paddingLeft="@dimen/avatar_item_distance" > + diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 919bcc7a3..87ea36f8d 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -61,6 +61,7 @@ + diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 98161fcc1..5bd04d25e 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -6,7 +6,9 @@ 8dp 8dp 12dp + 48dp 11sp 224dp 32dp + 16dp diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index c374265ce..4cdf905b3 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -78,6 +78,7 @@ @drawable/ic_notifications_off_black_24dp @drawable/ic_notifications_paused_black_24dp @drawable/ic_notifications_none_black_24dp + @drawable/ic_new_releases_black_24dp