From 0bb9c1d650ded71ff453700fb723963ff14bf71b Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 5 Aug 2020 16:49:14 -0300 Subject: [PATCH] Add light and dark spinner lotties with correct coloring. --- .../securesms/lock/v2/ConfirmKbsPinFragment.java | 7 ++++--- .../org/thoughtcrime/securesms/util/ThemeUtil.java | 11 +++++++++++ app/src/main/res/raw/lottie_kbs_fail_dark.json | 1 + app/src/main/res/raw/lottie_kbs_fail_light.json | 1 + app/src/main/res/raw/lottie_kbs_failure.json | 1 - app/src/main/res/raw/lottie_kbs_loading.json | 1 - app/src/main/res/raw/lottie_kbs_loading_dark.json | 1 + app/src/main/res/raw/lottie_kbs_loading_light.json | 1 + app/src/main/res/raw/lottie_kbs_success.json | 1 - app/src/main/res/raw/lottie_kbs_success_dark.json | 1 + app/src/main/res/raw/lottie_kbs_success_light.json | 1 + app/src/main/res/values/attrs.xml | 3 +++ app/src/main/res/values/themes.xml | 6 ++++++ 13 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/raw/lottie_kbs_fail_dark.json create mode 100644 app/src/main/res/raw/lottie_kbs_fail_light.json delete mode 100644 app/src/main/res/raw/lottie_kbs_failure.json delete mode 100644 app/src/main/res/raw/lottie_kbs_loading.json create mode 100644 app/src/main/res/raw/lottie_kbs_loading_dark.json create mode 100644 app/src/main/res/raw/lottie_kbs_loading_light.json delete mode 100644 app/src/main/res/raw/lottie_kbs_success.json create mode 100644 app/src/main/res/raw/lottie_kbs_success_dark.json create mode 100644 app/src/main/res/raw/lottie_kbs_success_light.json diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java index f54b210da7..1f1eee9302 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java @@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.megaphone.Megaphones; import org.thoughtcrime.securesms.registration.RegistrationUtil; import org.thoughtcrime.securesms.storage.StorageSyncHelper; import org.thoughtcrime.securesms.util.SpanUtil; +import org.thoughtcrime.securesms.util.ThemeUtil; import java.util.Objects; @@ -103,13 +104,13 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9dfbbfebdc..2aa8c29e34 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -198,6 +198,9 @@ @drawable/ic_kbs_splash_light_svg + @raw/lottie_kbs_loading_light + @raw/lottie_kbs_success_light + @raw/lottie_kbs_fail_light @color/white @drawable/ic_document_small_light @@ -510,6 +513,9 @@ @drawable/tinted_circle_dark @drawable/ic_kbs_splash_dark_svg + @raw/lottie_kbs_loading_dark + @raw/lottie_kbs_success_dark + @raw/lottie_kbs_fail_dark @color/core_grey_95 @drawable/ic_document_small_dark