diff --git a/app/build.gradle b/app/build.gradle index ed81ef1ea9..9affea622e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102115 - versionName "102.15 - Beta" + versionCode 102116 + versionName "102.16 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 13b044536d..0b6bb82437 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/widgets/directories/WidgetDirectoryChannel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java index d701eb5360..3ade303c4e 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java @@ -59,6 +59,7 @@ public final class WidgetDirectoryChannel extends AppFragment { private final ActivityResultLauncher activityResult = HubUtilsKt.getAddServerActivityResultHandler(this); private final Lazy adapter$delegate = g.lazy(new WidgetDirectoryChannel$adapter$2(this)); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding(this, WidgetDirectoryChannel$binding$2.INSTANCE, new WidgetDirectoryChannel$binding$3(this)); + private boolean hasBound; private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDirectoriesViewModel.class), new WidgetDirectoryChannel$appActivityViewModels$$inlined$activityViewModels$1(this), new e0(WidgetDirectoryChannel$viewModel$2.INSTANCE)); /* compiled from: WidgetDirectoryChannel.kt */ @@ -168,7 +169,7 @@ public final class WidgetDirectoryChannel extends AppFragment { if (widgetDirectoryChannelBinding == null) { widgetDirectoryChannelBinding = getBinding(); } - if (z2) { + if (!this.hasBound && z2) { c.a.o.b a = b.C0033b.a(); TabLayout tabLayout = widgetDirectoryChannelBinding.d; m.checkNotNullExpressionValue(tabLayout, "nonNullBinding.tabs"); @@ -177,16 +178,18 @@ public final class WidgetDirectoryChannel extends AppFragment { ViewPager2 viewPager2 = widgetDirectoryChannelBinding.e; m.checkNotNullExpressionValue(viewPager2, "nonNullBinding.viewPager"); a2.b(viewPager2); - return; + this.hasBound = true; + } else if (!z2) { + c.a.o.b a3 = b.C0033b.a(); + TabLayout tabLayout2 = widgetDirectoryChannelBinding.d; + m.checkNotNullExpressionValue(tabLayout2, "nonNullBinding.tabs"); + a3.c(tabLayout2); + c.a.o.b a4 = b.C0033b.a(); + ViewPager2 viewPager22 = widgetDirectoryChannelBinding.e; + m.checkNotNullExpressionValue(viewPager22, "nonNullBinding.viewPager"); + a4.c(viewPager22); + this.hasBound = false; } - c.a.o.b a3 = b.C0033b.a(); - TabLayout tabLayout2 = widgetDirectoryChannelBinding.d; - m.checkNotNullExpressionValue(tabLayout2, "nonNullBinding.tabs"); - a3.c(tabLayout2); - c.a.o.b a4 = b.C0033b.a(); - ViewPager2 viewPager22 = widgetDirectoryChannelBinding.e; - m.checkNotNullExpressionValue(viewPager22, "nonNullBinding.viewPager"); - a4.c(viewPager22); } public final WidgetDirectoryChannelViewPagerAdapter getAdapter() { 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 669947b96d..4b0c01640f 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,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 + " - 102.15 - Beta (102115)"); + textView.setText(string + " - 102.16 - Beta (102116)"); binding.B.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/values/strings.xml b/app/src/main/res/values/strings.xml index c18c50061c..ce077d9a80 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1505,7 +1505,7 @@ Select a color Transparency Use Default - 3aca1d331a4748e5b4372a93f0f5fbb6 + 876d671f173c48d099bb84f5532ef49f Coming Soon Slash command application {applicationName} {applicationName} application