diff --git a/app/build.gradle b/app/build.gradle index 63fffc5a8b..d3775bfff5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 99112 - versionName "99.12 - Beta" + versionCode 99113 + versionName "99.13 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5c1e22382d..a767c215a8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java new file mode 100644 index 0000000000..a2c664eee9 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$onCommandUsed$1.java @@ -0,0 +1,33 @@ +package com.discord.stores; + +import c0.z.d.o; +import com.discord.utilities.frecency.FrecencyTracker; +import java.util.Map; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreApplicationCommandFrecency.kt */ +public final class StoreApplicationCommandFrecency$onCommandUsed$1 extends o implements Function0 { + public final /* synthetic */ String $commandId; + public final /* synthetic */ Long $guildId; + public final /* synthetic */ StoreApplicationCommandFrecency this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreApplicationCommandFrecency$onCommandUsed$1(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l, String str) { + super(0); + this.this$0 = storeApplicationCommandFrecency; + this.$guildId = l; + this.$commandId = str; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo17invoke() { + FrecencyTracker.track$default(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), StoreApplicationCommandFrecency.access$getKey(this.this$0, this.$guildId, this.$commandId), 0, 2, null); + StoreApplicationCommandFrecency.access$getFrecencyCache$p(this.this$0).set(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), true); + Map access$getTopCommandIds$p = StoreApplicationCommandFrecency.access$getTopCommandIds$p(this.this$0); + Long l = this.$guildId; + access$getTopCommandIds$p.put(Long.valueOf(l != null ? l.longValue() : 0), StoreApplicationCommandFrecency.access$getAllTopCommandIds(this.this$0, this.$guildId)); + StoreApplicationCommandFrecency storeApplicationCommandFrecency = this.this$0; + storeApplicationCommandFrecency.markChanged(storeApplicationCommandFrecency); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java new file mode 100644 index 0000000000..c06b8d4ef0 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java @@ -0,0 +1,59 @@ +package com.discord.stores; + +import c0.g0.s; +import c0.g0.w; +import c0.t.g0; +import c0.t.h0; +import c0.t.u; +import c0.z.d.o; +import com.discord.utilities.frecency.FrecencyTracker; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreApplicationCommandFrecency.kt */ +public final class StoreApplicationCommandFrecency$populateStore$1 extends o implements Function0 { + public final /* synthetic */ StoreApplicationCommandFrecency this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreApplicationCommandFrecency$populateStore$1(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { + super(0); + this.this$0 = storeApplicationCommandFrecency; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo17invoke() { + LinkedHashMap linkedHashMap = new LinkedHashMap(); + for (String str : FrecencyTracker.getSortedKeys$default(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), 0, 1, null)) { + if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) { + List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null); + Long longOrNull = s.toLongOrNull((String) split$default.get(1)); + long longValue = longOrNull != null ? longOrNull.longValue() : 0; + String str2 = (String) split$default.get(0); + List list = (List) linkedHashMap.get(Long.valueOf(longValue)); + if (list == null) { + list = new ArrayList(); + linkedHashMap.put(Long.valueOf(longValue), list); + } + list.add(str2); + } else { + List list2 = (List) linkedHashMap.get(0L); + if (list2 == null) { + list2 = new ArrayList(); + linkedHashMap.put(0L, list2); + } + list2.add(str); + } + } + StoreApplicationCommandFrecency storeApplicationCommandFrecency = this.this$0; + LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size())); + for (Map.Entry entry : linkedHashMap.entrySet()) { + linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue())); + } + StoreApplicationCommandFrecency.access$setTopCommandIds$p(storeApplicationCommandFrecency, h0.toMutableMap(linkedHashMap2)); + StoreApplicationCommandFrecency.access$setTopCommandIdsSnapshot$p(this.this$0, linkedHashMap); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java index 990d8caf80..3d0f7fb778 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java @@ -1,12 +1,9 @@ package com.discord.stores; -import c0.g0.s; import c0.g0.w; -import c0.t.g0; import c0.t.h0; import c0.t.n; import c0.t.o; -import c0.t.u; import c0.z.d.m; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; @@ -25,18 +22,17 @@ import kotlin.jvm.internal.DefaultConstructorMarker; import rx.Observable; /* compiled from: StoreApplicationCommandFrecency.kt */ public final class StoreApplicationCommandFrecency extends StoreV2 { + private final Dispatcher dispatcher; private final ApplicationCommandFrecencyTracker frecency; private final Persister frecencyCache; private final ObservationDeck observationDeck; private Map> topCommandIds; private Map> topCommandIdsSnapshot; - public StoreApplicationCommandFrecency() { - this(null, 1, null); - } - - public StoreApplicationCommandFrecency(ObservationDeck observationDeck) { + public StoreApplicationCommandFrecency(Dispatcher dispatcher, ObservationDeck observationDeck) { + m.checkNotNullParameter(dispatcher, "dispatcher"); m.checkNotNullParameter(observationDeck, "observationDeck"); + this.dispatcher = dispatcher; this.observationDeck = observationDeck; Persister persister = new Persister<>("CACHE_KEY_APPLICATION_COMMANDS", new ApplicationCommandFrecencyTracker(0, 0, 3, null)); this.frecencyCache = persister; @@ -47,8 +43,40 @@ public final class StoreApplicationCommandFrecency extends StoreV2 { } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ StoreApplicationCommandFrecency(ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? ObservationDeckProvider.get() : observationDeck); + public /* synthetic */ StoreApplicationCommandFrecency(Dispatcher dispatcher, ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(dispatcher, (i & 2) != 0 ? ObservationDeckProvider.get() : observationDeck); + } + + public static final /* synthetic */ List access$getAllTopCommandIds(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l) { + return storeApplicationCommandFrecency.getAllTopCommandIds(l); + } + + public static final /* synthetic */ ApplicationCommandFrecencyTracker access$getFrecency$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { + return storeApplicationCommandFrecency.frecency; + } + + public static final /* synthetic */ Persister access$getFrecencyCache$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { + return storeApplicationCommandFrecency.frecencyCache; + } + + public static final /* synthetic */ String access$getKey(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Long l, String str) { + return storeApplicationCommandFrecency.getKey(l, str); + } + + public static final /* synthetic */ Map access$getTopCommandIds$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { + return storeApplicationCommandFrecency.topCommandIds; + } + + public static final /* synthetic */ Map access$getTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { + return storeApplicationCommandFrecency.topCommandIdsSnapshot; + } + + public static final /* synthetic */ void access$setTopCommandIds$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) { + storeApplicationCommandFrecency.topCommandIds = map; + } + + public static final /* synthetic */ void access$setTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) { + storeApplicationCommandFrecency.topCommandIdsSnapshot = map; } private final List getAllTopCommandIds(Long l) { @@ -106,41 +134,11 @@ public final class StoreApplicationCommandFrecency extends StoreV2 { public final void onCommandUsed(Long l, String str) { m.checkNotNullParameter(str, "commandId"); - FrecencyTracker.track$default(this.frecency, getKey(l, str), 0, 2, null); - this.frecencyCache.set(this.frecency, true); - this.topCommandIds.put(Long.valueOf(l != null ? l.longValue() : 0), getAllTopCommandIds(l)); - markChanged(this); + this.dispatcher.schedule(new StoreApplicationCommandFrecency$onCommandUsed$1(this, l, str)); } public final void populateStore() { - LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (String str : FrecencyTracker.getSortedKeys$default(this.frecency, 0, 1, null)) { - if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) { - List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null); - Long longOrNull = s.toLongOrNull((String) split$default.get(1)); - long longValue = longOrNull != null ? longOrNull.longValue() : 0; - String str2 = (String) split$default.get(0); - List list = (List) linkedHashMap.get(Long.valueOf(longValue)); - if (list == null) { - list = new ArrayList(); - linkedHashMap.put(Long.valueOf(longValue), list); - } - list.add(str2); - } else { - List list2 = (List) linkedHashMap.get(0L); - if (list2 == null) { - list2 = new ArrayList(); - linkedHashMap.put(0L, list2); - } - list2.add(str); - } - } - LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size())); - for (Map.Entry entry : linkedHashMap.entrySet()) { - linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue())); - } - this.topCommandIds = h0.toMutableMap(linkedHashMap2); - this.topCommandIdsSnapshot = linkedHashMap; + this.dispatcher.schedule(new StoreApplicationCommandFrecency$populateStore$1(this)); } @Override // com.discord.stores.StoreV2 diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java index ee210d474a..06e586e223 100644 --- a/app/src/main/java/com/discord/stores/StoreStream.java +++ b/app/src/main/java/com/discord/stores/StoreStream.java @@ -969,7 +969,7 @@ public final class StoreStream { this.expressionPickerNavigation = storeExpressionPickerNavigation; StoreChannelFollowerStats storeChannelFollowerStats = new StoreChannelFollowerStats(this.dispatcher, ObservationDeckProvider.get()); this.channelFollowerStats = storeChannelFollowerStats; - StoreApplicationCommandFrecency storeApplicationCommandFrecency = new StoreApplicationCommandFrecency(null, 1, null); + StoreApplicationCommandFrecency storeApplicationCommandFrecency = new StoreApplicationCommandFrecency(this.dispatcher, null, 2, null); this.applicationCommandFrecency = storeApplicationCommandFrecency; StorePendingReplies storePendingReplies = new StorePendingReplies(this.dispatcher, null, 2, null); this.pendingReplies = storePendingReplies; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index b6dacf0367..b041d74ca5 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -313,7 +313,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 99.12 - Beta (99112)"); + textView.setText(string + " - 99.13 - Beta (99113)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml b/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml new file mode 100644 index 0000000000..a289b9e238 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/img_landing_splash.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml index db00b91729..4da09d331d 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml index a319826efb..950f29d302 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml index 73bc6cd602..0be8f0e4f0 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml index 6efa610ccf..39da3ca299 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml index bca0844702..bce868b279 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml index 67bb7470f7..155c21b163 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml index 670b2062b8..884b3f9c53 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml index e2ee642be6..469637852b 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml @@ -16,7 +16,7 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml index f8de38b44c..eb4b62d8c7 100644 --- a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml +++ b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml @@ -47,7 +47,7 @@ - + diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml new file mode 100644 index 0000000000..b377ad8dee --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_landing_splash__0.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml new file mode 100644 index 0000000000..4f8405fb3a --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_landing_splash__1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml new file mode 100644 index 0000000000..cd96f20824 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_landing_splash__2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230790_img_nitro_pattern__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230790_img_nitro_pattern__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230791_img_nitro_pattern__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__1.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230791_img_nitro_pattern__1.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__1.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230792_img_nitro_pattern__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230795_img_nitro_pattern__2.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230792_img_nitro_pattern__2.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230795_img_nitro_pattern__2.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__3.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230796_img_nitro_pattern__3.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230793_img_nitro_pattern__3.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230796_img_nitro_pattern__3.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__4.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230797_img_nitro_pattern__4.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230794_img_nitro_pattern__4.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230797_img_nitro_pattern__4.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230795_img_plan_activated_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230798_img_plan_activated_dark__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230795_img_plan_activated_dark__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230798_img_plan_activated_dark__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230796_img_plan_activated_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230799_img_plan_activated_light__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230796_img_plan_activated_light__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230799_img_plan_activated_light__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230797_img_premium_activated_tier_1_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_1_dark__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230797_img_premium_activated_tier_1_dark__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_1_dark__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230798_img_premium_activated_tier_1_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230801_img_premium_activated_tier_1_light__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230798_img_premium_activated_tier_1_light__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230801_img_premium_activated_tier_1_light__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230799_img_premium_activated_tier_2_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230802_img_premium_activated_tier_2_dark__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230799_img_premium_activated_tier_2_dark__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230802_img_premium_activated_tier_2_dark__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_2_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230803_img_premium_activated_tier_2_light__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230800_img_premium_activated_tier_2_light__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230803_img_premium_activated_tier_2_light__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230801_img_remote_auth_loaded__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230804_img_remote_auth_loaded__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230801_img_remote_auth_loaded__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230804_img_remote_auth_loaded__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230802_img_wumpus_playing_with_friends__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230805_img_wumpus_playing_with_friends__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230802_img_wumpus_playing_with_friends__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230805_img_wumpus_playing_with_friends__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230803_screen_share_nfx_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230806_screen_share_nfx_illustration__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230803_screen_share_nfx_illustration__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230806_screen_share_nfx_illustration__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230804_screen_share_nfx_illustration__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230807_screen_share_nfx_illustration__1.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230804_screen_share_nfx_illustration__1.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230807_screen_share_nfx_illustration__1.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230805_screen_share_nfx_illustration__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230808_screen_share_nfx_illustration__2.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230805_screen_share_nfx_illustration__2.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230808_screen_share_nfx_illustration__2.xml diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230812_video_call_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230815_video_call_illustration__0.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v24/res_2131230812_video_call_illustration__0.xml rename to app/src/main/res/drawable-anydpi-v24/res_2131230815_video_call_illustration__0.xml diff --git a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml index f6addeec48..9c18bd36f3 100644 --- a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml +++ b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml @@ -28,11 +28,11 @@ - - + + - + diff --git a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml index ca2a05b324..9567d3f6d7 100644 --- a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml +++ b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable-hdpi/img_landing_splash.png b/app/src/main/res/drawable-hdpi/img_landing_splash.png new file mode 100644 index 0000000000..9447914e77 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable-ldpi/img_landing_splash.png b/app/src/main/res/drawable-ldpi/img_landing_splash.png new file mode 100644 index 0000000000..89b7c177d6 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable-mdpi/img_landing_splash.png b/app/src/main/res/drawable-mdpi/img_landing_splash.png new file mode 100644 index 0000000000..e2f34b2403 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable-mdpi/video_call_illustration.png b/app/src/main/res/drawable-mdpi/video_call_illustration.png index 4d72f72f4c..29619ad019 100644 Binary files a/app/src/main/res/drawable-mdpi/video_call_illustration.png and b/app/src/main/res/drawable-mdpi/video_call_illustration.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_landing_splash.png b/app/src/main/res/drawable-xhdpi/img_landing_splash.png new file mode 100644 index 0000000000..00359fec24 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_landing_splash.png b/app/src/main/res/drawable-xxhdpi/img_landing_splash.png new file mode 100644 index 0000000000..2f81fa3ab2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png b/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png new file mode 100644 index 0000000000..d0429403cd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_landing_splash.png differ diff --git a/app/src/main/res/drawable/img_landing_splash.png b/app/src/main/res/drawable/img_landing_splash.png deleted file mode 100644 index 8c98d1e0e4..0000000000 Binary files a/app/src/main/res/drawable/img_landing_splash.png and /dev/null differ diff --git a/app/src/main/res/drawable/res_2131230806_sparkle_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230809_sparkle_animated_vector__0.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230806_sparkle_animated_vector__0.xml rename to app/src/main/res/drawable/res_2131230809_sparkle_animated_vector__0.xml diff --git a/app/src/main/res/drawable/res_2131230807_sparkle_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230810_sparkle_animated_vector__1.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230807_sparkle_animated_vector__1.xml rename to app/src/main/res/drawable/res_2131230810_sparkle_animated_vector__1.xml diff --git a/app/src/main/res/drawable/res_2131230808_sparkle_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230811_sparkle_animated_vector__2.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230808_sparkle_animated_vector__2.xml rename to app/src/main/res/drawable/res_2131230811_sparkle_animated_vector__2.xml diff --git a/app/src/main/res/drawable/res_2131230809_sparkle_yellow_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230812_sparkle_yellow_animated_vector__0.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230809_sparkle_yellow_animated_vector__0.xml rename to app/src/main/res/drawable/res_2131230812_sparkle_yellow_animated_vector__0.xml diff --git a/app/src/main/res/drawable/res_2131230810_sparkle_yellow_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230813_sparkle_yellow_animated_vector__1.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230810_sparkle_yellow_animated_vector__1.xml rename to app/src/main/res/drawable/res_2131230813_sparkle_yellow_animated_vector__1.xml diff --git a/app/src/main/res/drawable/res_2131230811_sparkle_yellow_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230814_sparkle_yellow_animated_vector__2.xml similarity index 100% rename from app/src/main/res/drawable/res_2131230811_sparkle_yellow_animated_vector__2.xml rename to app/src/main/res/drawable/res_2131230814_sparkle_yellow_animated_vector__2.xml diff --git a/app/src/main/res/drawable/sparkle_animated_vector.xml b/app/src/main/res/drawable/sparkle_animated_vector.xml index 0c497f0db3..ad8824d9e1 100644 --- a/app/src/main/res/drawable/sparkle_animated_vector.xml +++ b/app/src/main/res/drawable/sparkle_animated_vector.xml @@ -1,5 +1,5 @@ - - - + + + diff --git a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml index 640bdc9657..07f79e412f 100644 --- a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml +++ b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml @@ -1,5 +1,5 @@ - - - + + + diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index bce5dfd5ee..9d0ab62b97 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -3452,1670 +3452,1673 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c69f1db904..56fe8d70d5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1446,7 +1446,7 @@ Select a color Transparency Use Default - 55ee48230f4945cb93cc26469fabb4b6 + 9f45f29e17d04aad8bb9d426a4b04aa4 Coming Soon Slash command application {applicationName} {applicationName} application